From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Wed, 11 Jun 2008 11:07:12 +0000 (+0300)
Subject: usb: musb: ignore disconnect on suspend
X-Git-Tag: v2.6.26-omap1~110
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d18d124ae0aaf5ac3e215c3005068750409a6a93;p=linux-2.6-omap-h63xx.git

usb: musb: ignore disconnect on suspend

This still needed, otherwise tusb2.0 won't connect after
a power cycle.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 8f7671cd5fc..75c3013544b 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -661,7 +661,11 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 			switch (musb->xceiv.state) {
 #ifdef CONFIG_USB_OTG
 			case OTG_STATE_A_SUSPEND:
-				musb->ignore_disconnect = 0;
+				/* We need to ignore disconnect on suspend
+				 * otherwise tusb 2.0 won't reconnect after a
+				 * power cycle, which breaks otg compliance.
+				 */
+				musb->ignore_disconnect = 1;
 				musb_g_reset(musb);
 				/* FALLTHROUGH */
 			case OTG_STATE_A_WAIT_BCON:	/* OPT TD.4.7-900ms */