diff options
| author | David Brownell <david-b@pacbell.net> | 2005-11-07 15:24:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 13:48:30 -0800 |
| commit | 2c1c3c4cd5f796b1912c65aaf3bf48c0ddf11f5e (patch) | |
| tree | d0adc25607629f4fbb9f45cc498f5c155d520291 /drivers/usb/host/ehci-hcd.c | |
| parent | 8d7802ed3c617120863f84346638d1cf1c96137b (diff) | |
| download | kernel_samsung_smdk4412-2c1c3c4cd5f796b1912c65aaf3bf48c0ddf11f5e.zip kernel_samsung_smdk4412-2c1c3c4cd5f796b1912c65aaf3bf48c0ddf11f5e.tar.gz kernel_samsung_smdk4412-2c1c3c4cd5f796b1912c65aaf3bf48c0ddf11f5e.tar.bz2 | |
[PATCH] USB: EHCI updates (4/4) driver model wakeup flags
This teaches the EHCI driver to use the new driver model wakeup flags,
replacing the similar ones in the HCD glue. It also adds a workaround
for the current glitch whereby PCI init doesn't init the wakeup flags
from the PCI PM capabilities. (EHCI controllers don't worry about
legacy mode; the PCI PM capability would always do the job.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 29f52a4..dd87102 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -624,7 +624,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd, struct pt_regs *regs) } /* remote wakeup [4.3.1] */ - if ((status & STS_PCD) && hcd->remote_wakeup) { + if ((status & STS_PCD) && device_may_wakeup(&hcd->self.root_hub->dev)) { unsigned i = HCS_N_PORTS (ehci->hcs_params); /* resume root hub? */ |