aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_gadget.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-10-17 11:26:46 -0500
committerFelipe Balbi <balbi@ti.com>2014-11-03 10:01:12 -0600
commit69e28882dc7a4ad80f1a0de1a2e7f346a15b6564 (patch)
tree5b8af7d3090334ddd81edb5b2dce640a276da4f2 /drivers/usb/musb/musb_gadget.c
parentusb: gadget: udc: s3c-hsudc: do not rely on 'driver' argument (diff)
downloadlinux-dev-69e28882dc7a4ad80f1a0de1a2e7f346a15b6564.tar.xz
linux-dev-69e28882dc7a4ad80f1a0de1a2e7f346a15b6564.zip
usb: musb: gadget: do not rely on 'driver' argument
future patches will remove the extra 'driver' argument to ->udc_stop(), in order to do that, we must make sure that our UDC does not rely on it first. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/musb_gadget.c')
-rw-r--r--drivers/usb/musb/musb_gadget.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 24c8c0219790..fdb8b3111b5a 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1946,11 +1946,11 @@ static int musb_gadget_stop(struct usb_gadget *g,
(void) musb_gadget_vbus_draw(&musb->g, 0);
musb->xceiv->state = OTG_STATE_UNDEFINED;
- stop_activity(musb, driver);
+ stop_activity(musb, NULL);
otg_set_peripheral(musb->xceiv->otg, NULL);
dev_dbg(musb->controller, "unregistering driver %s\n",
- driver ? driver->function : "(removed)");
+ musb->gadget_driver->function);
musb->is_active = 0;
musb->gadget_driver = NULL;