From 2a126d6d9678c2846bf2d8364a95ecfd819cb23b Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 15 Dec 2006 16:08:13 -0500 Subject: [PATCH] --- yaml --- r: 45312 b: refs/heads/master c: 25c77b329467d563ec1fa5c3efab0b13996ce810 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/uhci-hcd.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bede60a70929..539b56a801ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c80a70d53fa0ca47ad122cd75fe32b6f41c04eb1 +refs/heads/master: 25c77b329467d563ec1fa5c3efab0b13996ce810 diff --git a/trunk/drivers/usb/host/uhci-hcd.c b/trunk/drivers/usb/host/uhci-hcd.c index fecc8c971c17..e0d4c2358b39 100644 --- a/trunk/drivers/usb/host/uhci-hcd.c +++ b/trunk/drivers/usb/host/uhci-hcd.c @@ -257,7 +257,9 @@ __acquires(uhci->lock) int_enable = USBINTR_RESUME; if (remote_wakeup_is_broken(uhci)) egsm_enable = 0; - if (resume_detect_interrupts_are_broken(uhci) || !egsm_enable) + if (resume_detect_interrupts_are_broken(uhci) || !egsm_enable || + !device_may_wakeup( + &uhci_to_hcd(uhci)->self.root_hub->dev)) uhci->working_RD = int_enable = 0; outw(int_enable, uhci->io_addr + USBINTR);