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;