From: Tony Lindgren <tony@atomide.com>
Date: Mon, 27 Aug 2007 07:04:30 +0000 (-0700)
Subject: musb_hdrc: Fix OPT A error "B-OPT Did not detect reset after connecting"
X-Git-Tag: v2.6.23-omap1~142
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=32baf6090ed42140fd73bcc3d9872aa8b5e85f84;p=linux-2.6-omap-h63xx.git

musb_hdrc: Fix OPT A error "B-OPT Did not detect reset after connecting"

Fix OPT A error "B-OPT Did not detect reset after connecting"

hub 1-0:1.0: hub_suspend
usb usb1: suspend fail, err -16
usb usb1: 'global' suspend -16
hub 1-0:1.0: activate --> -108

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 f86fdcc339d..078e8856970 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -341,6 +341,14 @@ void musb_hnp_stop(struct musb *musb)
 		DBG(1, "HNP: Stopping in unknown state %s\n",
 			otg_state_string(musb));
 	}
+
+	/*
+	 * When returning to A state after HNP, avoid hub_port_rebounce(),
+	 * which cause occasional OPT A "Did not receive reset after connect"
+	 * errors.
+	 */
+	musb->port1_status &=
+		~(1 << USB_PORT_FEAT_C_CONNECTION);
 }
 
 #endif