Replace usb_gadget_driver's disconnect with udc-core's reset notifier at
bus reset handler.

Signed-off-by: Peter Chen <[email protected]>
---
 drivers/usb/chipidea/udc.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index b8125aa..5ca3711 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -692,10 +692,8 @@ __acquires(ci->lock)
        int retval;
 
        spin_unlock(&ci->lock);
-       if (ci->gadget.speed != USB_SPEED_UNKNOWN) {
-               if (ci->driver)
-                       ci->driver->disconnect(&ci->gadget);
-       }
+       if (ci->gadget.speed != USB_SPEED_UNKNOWN)
+               usb_gadget_udc_reset(&ci->gadget, ci->driver);
 
        retval = _gadget_stop_activity(&ci->gadget);
        if (retval)
@@ -709,8 +707,6 @@ __acquires(ci->lock)
        if (ci->status == NULL)
                retval = -ENOMEM;
 
-       usb_gadget_set_state(&ci->gadget, USB_STATE_DEFAULT);
-
 done:
        spin_lock(&ci->lock);
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to