Kaynağa Gözat

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>
Alan Stern 18 yıl önce
ebeveyn
işleme
3da2495c0a
1 değiştirilmiş dosya ile 2 ekleme ve 1 silme
  1. 2 1
      drivers/usb/host/ohci-hub.c

+ 2 - 1
drivers/usb/host/ohci-hub.c

@@ -422,7 +422,8 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)
 				ohci->autostop = 0;
 				ohci->autostop = 0;
 				ohci->next_statechange = jiffies +
 				ohci->next_statechange = jiffies +
 						STATECHANGE_DELAY;
 						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->next_statechange)
 					&& !ohci->ed_rm_list
 					&& !ohci->ed_rm_list
 					&& !(ohci->hc_control &
 					&& !(ohci->hc_control &