Skip to contentSkip to conversation

OHCI: disallow autostop when wakeup is disabled

PATCH New Alan Stern 1 participant 1 message Nov 15, 2006 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Alan Stern

author maintainer
#1 lore raw

PATCH 1/1 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.

---

Quoted 3 lines · Andrew Morton
Quoted 1 line

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

drivers/usb/host/ohci-hub.c +2 -1
Index: 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 &