From 2275290810f51b556c99e787f6c71bfc7547d811 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 May 2014 13:43:49 -0700 Subject: [PATCH] remove queue-3.10/usb-musb-avoid-null-pointer-dereference.patch --- queue-3.10/series | 1 - ...-musb-avoid-null-pointer-dereference.patch | 50 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 queue-3.10/usb-musb-avoid-null-pointer-dereference.patch diff --git a/queue-3.10/series b/queue-3.10/series index b818b4dcd0c..0eb024dd1e2 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -69,7 +69,6 @@ media-saa7134-fix-warn_on-during-resume.patch media-omap3isp-preview-fix-the-crop-margins.patch media-media-gspca-sn9c20x-add-id-for-genius-look-1320-v2.patch usb-dwc3-fix-wrong-bit-mask-in-dwc3_event_devt.patch -usb-musb-avoid-null-pointer-dereference.patch hvc-ensure-hvc_init-is-only-ever-called-once-in-hvc_console.c.patch usb-phy-add-ulpi-ids-for-smsc-usb3320-and-ti-tusb1210.patch usb-unbind-all-interfaces-before-rebinding-any.patch diff --git a/queue-3.10/usb-musb-avoid-null-pointer-dereference.patch b/queue-3.10/usb-musb-avoid-null-pointer-dereference.patch deleted file mode 100644 index 3d5a918dfb9..00000000000 --- a/queue-3.10/usb-musb-avoid-null-pointer-dereference.patch +++ /dev/null @@ -1,50 +0,0 @@ -From eee3f15d5f1f4f0c283dd4db67dc1b874a2852d1 Mon Sep 17 00:00:00 2001 -From: Felipe Balbi -Date: Tue, 25 Feb 2014 10:58:43 -0600 -Subject: usb: musb: avoid NULL pointer dereference - -From: Felipe Balbi - -commit eee3f15d5f1f4f0c283dd4db67dc1b874a2852d1 upstream. - -instead of relying on the otg pointer, which -can be NULL in certain cases, we can use the -gadget and host pointers we already hold inside -struct musb. - -Tested-by: Tony Lindgren -Signed-off-by: Felipe Balbi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/musb/musb_core.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/drivers/usb/musb/musb_core.c -+++ b/drivers/usb/musb/musb_core.c -@@ -440,7 +440,6 @@ void musb_hnp_stop(struct musb *musb) - static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb, - u8 devctl) - { -- struct usb_otg *otg = musb->xceiv->otg; - irqreturn_t handled = IRQ_NONE; - - dev_dbg(musb->controller, "<== DevCtl=%02x, int_usb=0x%x\n", devctl, -@@ -655,7 +654,7 @@ static irqreturn_t musb_stage0_irq(struc - break; - case OTG_STATE_B_PERIPHERAL: - musb_g_suspend(musb); -- musb->is_active = otg->gadget->b_hnp_enable; -+ musb->is_active = musb->g.b_hnp_enable; - if (musb->is_active) { - musb->xceiv->state = OTG_STATE_B_WAIT_ACON; - dev_dbg(musb->controller, "HNP: Setting timer for b_ase0_brst\n"); -@@ -671,7 +670,7 @@ static irqreturn_t musb_stage0_irq(struc - break; - case OTG_STATE_A_HOST: - musb->xceiv->state = OTG_STATE_A_SUSPEND; -- musb->is_active = otg->host->b_hnp_enable; -+ musb->is_active = musb->hcd->self.b_hnp_enable; - break; - case OTG_STATE_B_HOST: - /* Transition to B_PERIPHERAL, see 6.8.2.6 p 44 */ -- 2.47.3