diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-14 16:06:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-14 16:06:15 -0400 |
commit | 43e699cebee2d521d499b6c9abbdcdfa46ac28f7 (patch) | |
tree | bded1a24b56e16716f10692d971ddb628dbaa305 | |
parent | 4294bca7b423d1a5aa24307e3d112a04075e3763 (diff) |
Revert "usb: musb: gadget: fix otg active status flag"
This reverts commit 9b0a1de3c85d99d881c86a29b3d52da7b9c7bd61.
Aaro writes:
With v3.12-rc4 I can no longer connect to N800 (OMAP2) with USB
(peripheral, g_ether).
According to git bisect this is caused by:
9b0a1de3c85d99d881c86a29b3d52da7b9c7bd61 is the first bad commit
So revert this patch, as Felipe says:
It's unfortunate that tusb6010 is so messed up
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/musb/musb_gadget.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 07bf4dfddeaa..3671898a4535 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
@@ -1853,6 +1853,7 @@ static int musb_gadget_start(struct usb_gadget *g, | |||
1853 | musb->gadget_driver = driver; | 1853 | musb->gadget_driver = driver; |
1854 | 1854 | ||
1855 | spin_lock_irqsave(&musb->lock, flags); | 1855 | spin_lock_irqsave(&musb->lock, flags); |
1856 | musb->is_active = 1; | ||
1856 | 1857 | ||
1857 | otg_set_peripheral(otg, &musb->g); | 1858 | otg_set_peripheral(otg, &musb->g); |
1858 | musb->xceiv->state = OTG_STATE_B_IDLE; | 1859 | musb->xceiv->state = OTG_STATE_B_IDLE; |