diff --git a/[refs] b/[refs]
index ed01d7cfd0ce..037f29af3cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccd9509a0b942f7a139f1adb741a746ef0220911
+refs/heads/master: 997ff893603c6455da4c5e26ba1d0f81adfecdfc
diff --git a/trunk/drivers/usb/host/uhci-hub.c b/trunk/drivers/usb/host/uhci-hub.c
index f87bee6d2789..9189bc984c98 100644
--- a/trunk/drivers/usb/host/uhci-hub.c
+++ b/trunk/drivers/usb/host/uhci-hub.c
@@ -225,7 +225,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;