summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAlan Stern2008-01-10 17:14:53 +0100
committerGreg Kroah-Hartman2008-02-01 23:35:03 +0100
commitcd930c931417295ac6b4d9fea62accc67192ac34 (patch)
treea49ca31eaadd53810760c0d363c43e6876312259 /drivers/usb
parentUSB: EHCI: move del_timer_sync calls outside spinlocked region (diff)
downloadkernel-qcow2-linux-cd930c931417295ac6b4d9fea62accc67192ac34.tar.gz
kernel-qcow2-linux-cd930c931417295ac6b4d9fea62accc67192ac34.tar.xz
kernel-qcow2-linux-cd930c931417295ac6b4d9fea62accc67192ac34.zip
USB: EHCI: add a short delay to the bus_suspend routine
This patch (as1031) adds a short delay to the bus-suspend routine in ehci-hcd. Without it some devices disconnect when they should suspend. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-hub.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 7919a411d5f9..ccd88ae011c6 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/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;