From cc25a6b04023cc80d4a63f889dd9325ae9661c69 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Thu, 10 Jan 2008 11:14:53 -0500
Subject: [PATCH] --- yaml --- r: 82267 b: refs/heads/master c:
 cd930c931417295ac6b4d9fea62accc67192ac34 h: refs/heads/master i:   82265:
 fe4807e10a930d1004b54363b677e06a986a4f96   82263:
 3ce60377e7981eb2d8ef397854f7a14c3912f29d v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/ehci-hub.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 54463bc8c639..c572f87922c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8fa7571a928d6d0e1b7444b0ea69ec7dc7db3b6
+refs/heads/master: cd930c931417295ac6b4d9fea62accc67192ac34
diff --git a/trunk/drivers/usb/host/ehci-hub.c b/trunk/drivers/usb/host/ehci-hub.c
index 7919a411d5f9..ccd88ae011c6 100644
--- a/trunk/drivers/usb/host/ehci-hub.c
+++ b/trunk/drivers/usb/host/ehci-hub.c
@@ -172,6 +172,10 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
 		}
 	}
 
+	/* Apparently some devices need a >= 1-uframe delay here */
+	if (ehci->bus_suspended)
+		udelay(150);
+
 	/* turn off now-idle HC */
 	ehci_halt (ehci);
 	hcd->state = HC_STATE_SUSPENDED;