Messages in this thread Patch in this message | | | Date | Wed, 15 Nov 2006 11:59:28 -0500 (EST) | From | Alan Stern <> | Subject | [PATCH] OHCI: disallow autostop when wakeup is disabled |
| |
This patch (as822) prevents the OHCI autostop mechanism from starting up if the root hub is not able or not allowed to issue wakeup requests.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
---
On Tue, 14 Nov 2006, Andrew Morton wrote:
> > Then this should get merged into 2.6.19-rc ASAP ... > > please send final version?
Here it is. A copy has already been sent to Greg KH.
Alan Stern
Index: 2.6.19-rc5/drivers/usb/host/ohci-hub.c =================================================================== --- 2.6.19-rc5.orig/drivers/usb/host/ohci-hub.c +++ 2.6.19-rc5/drivers/usb/host/ohci-hub.c @@ -422,7 +422,8 @@ ohci_hub_status_data (struct usb_hcd *hc 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 & - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |