Commit 5f5610f6 authored by Alan Stern's avatar Alan Stern Committed by Felipe Balbi

usb: gadget: fix a bug and a WARN_ON in dummy-hcd

This patch fixes a NULL pointer dereference and a WARN_ON in
dummy-hcd.  These things were the result of moving to the UDC core
framework, and possibly of changes to that framework.

Now unloading a gadget driver causes the UDC to be stopped after the
gadget driver is unbound, not before.  Therefore the "driver" argument
to dummy_udc_stop() can be NULL, so we must not try to print the
driver's name without checking first.

Also, the UDC framework automatically unregisters the gadget when the
UDC is deleted.  Therefore a sysfs attribute file attached to the
gadget must be removed before the UDC is deleted, not after.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 2389df45
...@@ -923,6 +923,7 @@ static int dummy_udc_stop(struct usb_gadget *g, ...@@ -923,6 +923,7 @@ static int dummy_udc_stop(struct usb_gadget *g,
struct dummy_hcd *dum_hcd = gadget_to_dummy_hcd(g); struct dummy_hcd *dum_hcd = gadget_to_dummy_hcd(g);
struct dummy *dum = dum_hcd->dum; struct dummy *dum = dum_hcd->dum;
if (driver)
dev_dbg(udc_dev(dum), "unregister gadget driver '%s'\n", dev_dbg(udc_dev(dum), "unregister gadget driver '%s'\n",
driver->driver.name); driver->driver.name);
...@@ -1000,8 +1001,8 @@ static int dummy_udc_remove(struct platform_device *pdev) ...@@ -1000,8 +1001,8 @@ static int dummy_udc_remove(struct platform_device *pdev)
{ {
struct dummy *dum = platform_get_drvdata(pdev); struct dummy *dum = platform_get_drvdata(pdev);
usb_del_gadget_udc(&dum->gadget);
device_remove_file(&dum->gadget.dev, &dev_attr_function); device_remove_file(&dum->gadget.dev, &dev_attr_function);
usb_del_gadget_udc(&dum->gadget);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment