p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Peter chen <peter.chen@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Alan Stern 2014-11-06 14:27:55 +08:00 committed by Felipe Balbi
parent 1189f7f6dc
commit 8480484d6f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/gadget/udc/dummy_hcd.c
View File

@ -367,19 +367,22 @@ 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);
dum->driver->disconnect(&dum->gadget); if (reset)
usb_gadget_udc_reset(&dum->gadget, dum->driver);
else
dum->driver->disconnect(&dum->gadget);
spin_lock(&dum->lock); spin_lock(&dum->lock);
} }
} else if (dum_hcd->active != dum_hcd->old_active) { } else if (dum_hcd->active != dum_hcd->old_active) {