Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / usb / gadget / udc / fsl_udc_core.c

diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 8e71c9ce3f9f205c61bc954d8483ed1e5579d13c..2df807403f22c851e873df6aae941319bd63d334 100644 (file)
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -1236,9 +1236,8 @@ static int fsl_pullup(struct usb_gadget *gadget, int is_on)
 
 static int fsl_udc_start(struct usb_gadget *g,
                struct usb_gadget_driver *driver);
-static int fsl_udc_stop(struct usb_gadget *g,
-               struct usb_gadget_driver *driver);
-/* defined in gadget.h */
+static int fsl_udc_stop(struct usb_gadget *g);
+
 static const struct usb_gadget_ops fsl_gadget_ops = {
        .get_frame = fsl_get_frame,
        .wakeup = fsl_wakeup,
@@ -1772,7 +1771,7 @@ static void bus_resume(struct fsl_udc *udc)
 }
 
 /* Clear up all ep queues */
-static int reset_queues(struct fsl_udc *udc)
+static int reset_queues(struct fsl_udc *udc, bool bus_reset)
 {
        u8 pipe;
 
@@ -1781,7 +1780,10 @@ static int reset_queues(struct fsl_udc *udc)
 
        /* report disconnect; the driver is already quiesced */
        spin_unlock(&udc->lock);
-       udc->driver->disconnect(&udc->gadget);
+       if (bus_reset)
+               usb_gadget_udc_reset(&udc->gadget, udc->driver);
+       else
+               udc->driver->disconnect(&udc->gadget);
        spin_lock(&udc->lock);
 
        return 0;
@@ -1835,7 +1837,7 @@ static void reset_irq(struct fsl_udc *udc)
                udc->bus_reset = 1;
                /* Reset all the queues, include XD, dTD, EP queue
                 * head and TR Queue */
-               reset_queues(udc);
+               reset_queues(udc, true);
                udc->usb_state = USB_STATE_DEFAULT;
        } else {
                VDBG("Controller reset");
@@ -1844,7 +1846,7 @@ static void reset_irq(struct fsl_udc *udc)
                dr_controller_setup(udc);
 
                /* Reset all internal used Queues */
-               reset_queues(udc);
+               reset_queues(udc, false);
 
                ep0_setup(udc);
 
@@ -1975,8 +1977,7 @@ static int fsl_udc_start(struct usb_gadget *g,
 }
 
 /* Disconnect from gadget driver */
-static int fsl_udc_stop(struct usb_gadget *g,
-               struct usb_gadget_driver *driver)
+static int fsl_udc_stop(struct usb_gadget *g)
 {
        struct fsl_ep *loop_ep;
        unsigned long flags;