USB: pxa27x_udc - Fix Oops

kbeldan · gregkh · commit 3f886620742e · 2008-05-20T14:14:14.000-07:00
udc_disable oopses dereferencing udc_command.

Signed-off-by: Karl Beldan &lt;karl.beldan@gmail.com&gt;
Acked-by: Robert Jarzmik &lt;rjarzmik@free.fr&gt;
Acked-by: David Brownell &lt;dbrownell@users.sourceforge.net&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
@@ -1526,7 +1526,8 @@ static void udc_disable(struct pxa_udc *udc)
 
 	ep0_idle(udc);
 	udc->gadget.speed = USB_SPEED_UNKNOWN;
-	udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
+	if (udc->mach->udc_command)
+		udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1526,7 +1526,8 @@ static void udc_disable(struct pxa_udc *udc)`
`1526`	`1526`
`1527`	`1527`	`ep0_idle(udc);`
`1528`	`1528`	`udc->gadget.speed = USB_SPEED_UNKNOWN;`
`1529`		`- udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);`
	`1529`	`+ if (udc->mach->udc_command)`
	`1530`	`+ udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);`
`1530`	`1531`	`}`
`1531`	`1532`
`1532`	`1533`	`/**`