diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:53:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:53:40 -0500 |
| commit | c8a4f06e4b27dba425ed49fa603d9257e4cd9ece (patch) | |
| tree | e303035bfce92ce11306cea1f487513781ef7d06 /drivers/usb/core/hcd-pci.c | |
| parent | 4ab432677957e0a064bba3690004d3244de8ad6c (diff) | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/core/hcd-pci.c')
| -rw-r--r-- | drivers/usb/core/hcd-pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 5131d88e8c5b..29b5b2a6e183 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -219,6 +219,7 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message) goto done; } } + synchronize_irq(dev->irq); /* FIXME until the generic PM interfaces change a lot more, this * can't use PCI D1 and D2 states. For example, the confusion @@ -392,7 +393,7 @@ int usb_hcd_pci_resume (struct pci_dev *dev) dev->dev.power.power_state = PMSG_ON; - hcd->saw_irq = 0; + clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); if (hcd->driver->resume) { retval = hcd->driver->resume(hcd); |