summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-hcd.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-12-22 17:05:18 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 13:48:30 -0800
commitd97cc2f2e938547a47daef29bc10ab38600a3310 (patch)
tree587a5b6abd9391975077de52cc7b5e75b47ad3a2 /drivers/usb/host/ehci-hcd.c
parent2c1c3c4cd5f796b1912c65aaf3bf48c0ddf11f5e (diff)
downloadop-kernel-dev-d97cc2f2e938547a47daef29bc10ab38600a3310.zip
op-kernel-dev-d97cc2f2e938547a47daef29bc10ab38600a3310.tar.gz
[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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index dd87102..b5b57e9 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) && device_may_wakeup(&hcd->self.root_hub->dev)) {
+ if (status & STS_PCD) {
unsigned i = HCS_N_PORTS (ehci->hcs_params);
/* resume root hub? */
OpenPOWER on IntegriCloud