diff options
author | Felipe Balbi <balbi@ti.com> | 2014-10-17 12:26:46 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-11-03 11:01:12 -0500 |
commit | 69e28882dc7a4ad80f1a0de1a2e7f346a15b6564 (patch) | |
tree | 5b8af7d3090334ddd81edb5b2dce640a276da4f2 | |
parent | 82891b959cbb2cd1827bc2713d46840fcf8dbe14 (diff) |
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>
-rw-r--r-- | drivers/usb/musb/musb_gadget.c | 4 |
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, | |||
1946 | (void) musb_gadget_vbus_draw(&musb->g, 0); | 1946 | (void) musb_gadget_vbus_draw(&musb->g, 0); |
1947 | 1947 | ||
1948 | musb->xceiv->state = OTG_STATE_UNDEFINED; | 1948 | musb->xceiv->state = OTG_STATE_UNDEFINED; |
1949 | stop_activity(musb, driver); | 1949 | stop_activity(musb, NULL); |
1950 | otg_set_peripheral(musb->xceiv->otg, NULL); | 1950 | otg_set_peripheral(musb->xceiv->otg, NULL); |
1951 | 1951 | ||
1952 | dev_dbg(musb->controller, "unregistering driver %s\n", | 1952 | dev_dbg(musb->controller, "unregistering driver %s\n", |
1953 | driver ? driver->function : "(removed)"); | 1953 | musb->gadget_driver->function); |
1954 | 1954 | ||
1955 | musb->is_active = 0; | 1955 | musb->is_active = 0; |
1956 | musb->gadget_driver = NULL; | 1956 | musb->gadget_driver = NULL; |