Commit 8480484d authored by Alan Stern's avatar Alan Stern Committed by Felipe Balbi

usb: gadget: dummy-hcd: use udc-core's reset notifier

Replace usb_gadget_driver's disconnect with udc-core's reset notifier at
bus reset handler.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarPeter chen <peter.chen@freescale.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1189f7f6
...@@ -367,18 +367,21 @@ static void set_link_state(struct dummy_hcd *dum_hcd) ...@@ -367,18 +367,21 @@ static void set_link_state(struct dummy_hcd *dum_hcd)
dum_hcd->active) dum_hcd->active)
dum_hcd->resuming = 0; dum_hcd->resuming = 0;
/* if !connected or reset */ /* Currently !connected or in reset */
if ((dum_hcd->port_status & USB_PORT_STAT_CONNECTION) == 0 || if ((dum_hcd->port_status & USB_PORT_STAT_CONNECTION) == 0 ||
(dum_hcd->port_status & USB_PORT_STAT_RESET) != 0) { (dum_hcd->port_status & USB_PORT_STAT_RESET) != 0) {
/* unsigned disconnect = USB_PORT_STAT_CONNECTION &
* We're connected and not reset (reset occurred now), dum_hcd->old_status & (~dum_hcd->port_status);
* and driver attached - disconnect! unsigned reset = USB_PORT_STAT_RESET &
*/ (~dum_hcd->old_status) & dum_hcd->port_status;
if ((dum_hcd->old_status & USB_PORT_STAT_CONNECTION) != 0 &&
(dum_hcd->old_status & USB_PORT_STAT_RESET) == 0 && /* Report reset and disconnect events to the driver */
dum->driver) { if (dum->driver && (disconnect || reset)) {
stop_activity(dum); stop_activity(dum);
spin_unlock(&dum->lock); spin_unlock(&dum->lock);
if (reset)
usb_gadget_udc_reset(&dum->gadget, dum->driver);
else
dum->driver->disconnect(&dum->gadget); dum->driver->disconnect(&dum->gadget);
spin_lock(&dum->lock); spin_lock(&dum->lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment