aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/uhci-hcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index fecc8c971c17..e0d4c2358b39 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -257,7 +257,9 @@ __acquires(uhci->lock)
257 int_enable = USBINTR_RESUME; 257 int_enable = USBINTR_RESUME;
258 if (remote_wakeup_is_broken(uhci)) 258 if (remote_wakeup_is_broken(uhci))
259 egsm_enable = 0; 259 egsm_enable = 0;
260 if (resume_detect_interrupts_are_broken(uhci) || !egsm_enable) 260 if (resume_detect_interrupts_are_broken(uhci) || !egsm_enable ||
261 !device_may_wakeup(
262 &uhci_to_hcd(uhci)->self.root_hub->dev))
261 uhci->working_RD = int_enable = 0; 263 uhci->working_RD = int_enable = 0;
262 264
263 outw(int_enable, uhci->io_addr + USBINTR); 265 outw(int_enable, uhci->io_addr + USBINTR);