diff options
author | David Brownell <david-b@pacbell.net> | 2005-12-22 20:05:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 16:48:30 -0500 |
commit | d97cc2f2e938547a47daef29bc10ab38600a3310 (patch) | |
tree | 587a5b6abd9391975077de52cc7b5e75b47ad3a2 /drivers/usb/host/ehci-hcd.c | |
parent | 2c1c3c4cd5f796b1912c65aaf3bf48c0ddf11f5e (diff) |
[PATCH] USB: ehci fix driver model wakeup flags
On some systems, EHCI seems to be getting IRQs too early during driver
setup ... before the root hub is allocated, in particular, making trouble
for any code chasing down root hub pointers! In this case, it seems to
be safe to just ignore the root hub setting. Thanks to Rafael J. Wysocki
for getting this properly tested.
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 dd871023265c..b5b57e957e5f 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) | |||
624 | } | 624 | } |
625 | 625 | ||
626 | /* remote wakeup [4.3.1] */ | 626 | /* remote wakeup [4.3.1] */ |
627 | if ((status & STS_PCD) && device_may_wakeup(&hcd->self.root_hub->dev)) { | 627 | if (status & STS_PCD) { |
628 | unsigned i = HCS_N_PORTS (ehci->hcs_params); | 628 | unsigned i = HCS_N_PORTS (ehci->hcs_params); |
629 | 629 | ||
630 | /* resume root hub? */ | 630 | /* resume root hub? */ |