summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-05-14 13:55:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-07 12:49:12 -0700
commitee4998cca0218751458709c0db61d258adb6a86d (patch)
treebd8b3c68bc01897a1ee4a089cc74055144649730
parent99d96e8cd47fddbe3170339889440d44181a6f03 (diff)
downloadlinux-3.10-ee4998cca0218751458709c0db61d258adb6a86d.tar.gz
linux-3.10-ee4998cca0218751458709c0db61d258adb6a86d.tar.bz2
linux-3.10-ee4998cca0218751458709c0db61d258adb6a86d.zip
USB: UHCI: fix for suspend of virtual HP controller
commit 997ff893603c6455da4c5e26ba1d0f81adfecdfc upstream. HP's virtual UHCI host controller takes a long time to suspend (several hundred microseconds), even when no devices are attached. This provokes a warning message from uhci-hcd in the auto-stop case. To prevent this from happening, this patch adds a test to avoid performing an auto-stop when the wait_for_hp quirk flag is set. The controller will still suspend through the normal runtime PM mechanism. And since that pathway includes a 1-ms delay, the slowness of the virtual hardware won't matter. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reported-and-tested-by: ZhenHua <zhen-hual@hp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/uhci-hub.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index 768d54295a2..c9946556512 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -222,7 +222,8 @@ static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf)
/* auto-stop if nothing connected for 1 second */
if (any_ports_active(uhci))
uhci->rh_state = UHCI_RH_RUNNING;
- else if (time_after_eq(jiffies, uhci->auto_stop_time))
+ else if (time_after_eq(jiffies, uhci->auto_stop_time) &&
+ !uhci->wait_for_hp)
suspend_rh(uhci, UHCI_RH_AUTO_STOPPED);
break;