aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2006-11-14 16:28:01 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-11-16 17:26:11 -0500
commit3da2495c0a92723d58cacaaff48dc60a29ddaae6 (patch)
tree15df1f341c3c6f4f11edbe79306936a95a9ce423
parent237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 (diff)
OHCI: disallow autostop when wakeup is not available
This patch (as822) prevents the OHCI autostop mechanism from kicking in if the root hub is not able or not allowed to issue wakeup requests. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/host/ohci-hub.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 6f113596af66..da09e7930c1b 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -422,7 +422,8 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)
422 ohci->autostop = 0; 422 ohci->autostop = 0;
423 ohci->next_statechange = jiffies + 423 ohci->next_statechange = jiffies +
424 STATECHANGE_DELAY; 424 STATECHANGE_DELAY;
425 } else if (time_after_eq (jiffies, 425 } else if (device_may_wakeup(&hcd->self.root_hub->dev)
426 && time_after_eq(jiffies,
426 ohci->next_statechange) 427 ohci->next_statechange)
427 && !ohci->ed_rm_list 428 && !ohci->ed_rm_list
428 && !(ohci->hc_control & 429 && !(ohci->hc_control &