From: Alan Stern Date: Tue, 14 Nov 2006 21:28:01 +0000 (-0500) Subject: OHCI: disallow autostop when wakeup is not available X-Git-Tag: v3.12-rc1~31920^2~20^2~82^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3da2495c0a92723d58cacaaff48dc60a29ddaae6;p=kernel%2Fkernel-generic.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index 6f11359..da09e79 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) ohci->autostop = 0; ohci->next_statechange = jiffies + STATECHANGE_DELAY; - } else if (time_after_eq (jiffies, + } else if (device_may_wakeup(&hcd->self.root_hub->dev) + && time_after_eq(jiffies, ohci->next_statechange) && !ohci->ed_rm_list && !(ohci->hc_control &