diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-03-18 10:14:47 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-03-20 16:46:28 +0200 |
| commit | 699412d951e6dd4dec48db88f33dc27b361582f0 (patch) | |
| tree | d59e14e3e51503898355949aa81c561ffecef2ac /drivers/usb | |
| parent | 06d9db7273c7bd5b07624b313faeea57a4b31056 (diff) | |
| download | linux-3.10-699412d951e6dd4dec48db88f33dc27b361582f0.tar.gz linux-3.10-699412d951e6dd4dec48db88f33dc27b361582f0.tar.bz2 linux-3.10-699412d951e6dd4dec48db88f33dc27b361582f0.zip | |
usb: gadget: net22xx: fix ->disconnect reporting
with the latest udc_start/udc_stop conversion,
too much code was deleted which ended up creating
a regression in net2272 and net2280 drivers.
To fix the regression we revert one hunk of the
original commits.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/net2272.c | 7 | ||||
| -rw-r--r-- | drivers/usb/gadget/net2280.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c index d226058e3b8..17628337c6b 100644 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@ -1495,6 +1495,13 @@ stop_activity(struct net2272 *dev, struct usb_gadget_driver *driver) for (i = 0; i < 4; ++i) net2272_dequeue_all(&dev->ep[i]); + /* report disconnect; the driver is already quiesced */ + if (driver) { + spin_unlock(&dev->lock); + driver->disconnect(&dev->gadget); + spin_lock(&dev->lock); + } + net2272_usb_reinit(dev); } diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index a1b650e1133..3105a4d601c 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@ -1946,6 +1946,13 @@ stop_activity (struct net2280 *dev, struct usb_gadget_driver *driver) for (i = 0; i < 7; i++) nuke (&dev->ep [i]); + /* report disconnect; the driver is already quiesced */ + if (driver) { + spin_unlock(&dev->lock); + driver->disconnect(&dev->gadget); + spin_lock(&dev->lock); + } + usb_reinit (dev); } |