]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: gadget: mv_udc_core: use udc-core's reset notifier
authorPeter Chen <peter.chen@freescale.com>
Thu, 6 Nov 2014 06:28:03 +0000 (14:28 +0800)
committerFelipe Balbi <balbi@ti.com>
Mon, 10 Nov 2014 23:19:37 +0000 (17:19 -0600)
Replace usb_gadget_driver's disconnect with udc-core's reset notifier at
bus reset handler.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/gadget/udc/mv_udc_core.c

index f104ac090a995fcb54dece31769ec443043165dd..d4edd763e9632a4c6b17dbe36e27932307d7c495 100644 (file)
@@ -1307,6 +1307,23 @@ static void nuke(struct mv_ep *ep, int status)
        }
 }
 
+static void gadget_reset(struct mv_udc *udc, struct usb_gadget_driver *driver)
+{
+       struct mv_ep    *ep;
+
+       nuke(&udc->eps[0], -ESHUTDOWN);
+
+       list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
+               nuke(ep, -ESHUTDOWN);
+       }
+
+       /* report reset; the driver is already quiesced */
+       if (driver) {
+               spin_unlock(&udc->lock);
+               usb_gadget_udc_reset(&udc->gadget, driver);
+               spin_lock(&udc->lock);
+       }
+}
 /* stop all USB activities */
 static void stop_activity(struct mv_udc *udc, struct usb_gadget_driver *driver)
 {
@@ -1881,7 +1898,7 @@ static void irq_process_reset(struct mv_udc *udc)
                dev_info(&udc->dev->dev, "usb bus reset\n");
                udc->usb_state = USB_STATE_DEFAULT;
                /* reset all the queues, stop all USB activities */
-               stop_activity(udc, udc->driver);
+               gadget_reset(udc, udc->driver);
        } else {
                dev_info(&udc->dev->dev, "USB reset portsc 0x%x\n",
                        readl(&udc->op_regs->portsc));