diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2006-12-15 16:08:13 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-01-05 12:19:08 -0800 |
| commit | 25c77b329467d563ec1fa5c3efab0b13996ce810 (patch) | |
| tree | 8a19d8beb79bc2f3d18118fec3653e470b8cdaa2 | |
| parent | c80a70d53fa0ca47ad122cd75fe32b6f41c04eb1 (diff) | |
| download | blackbird-op-linux-25c77b329467d563ec1fa5c3efab0b13996ce810.tar.gz blackbird-op-linux-25c77b329467d563ec1fa5c3efab0b13996ce810.zip | |
UHCI: support device_may_wakeup
This patch (as831) adds device_may_wakeup() support to uhci-hcd; it
has been lacking for a long time.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/uhci-hcd.c | 4 |
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) 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); |
