usb: musb: gadget: do not rely on 'driver' argument
authorFelipe Balbi <balbi@ti.com>
Fri, 17 Oct 2014 16:26:46 +0000 (11:26 -0500)
committerFelipe Balbi <balbi@ti.com>
Mon, 3 Nov 2014 16:01:12 +0000 (10:01 -0600)
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>
drivers/usb/musb/musb_gadget.c

index 24c8c02197905b0da8638d3f3d09184940c61998..fdb8b3111b5a1823c991b50c9fb6f7b219828239 100644 (file)
@@ -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;