diff options
| author |   Andiry Xu <andiry.xu@amd.com> | 2010-12-27 17:39:02 +0800 |
|---|---|---|
| committer |   Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-01-14 15:28:52 -0800 |
| commit | 0029227f1bc30b6c809ae751f9e7af6cef900997 (patch) | |
| tree | 4962aacd3349c149c1d1567aaa09cd9ac8efec0f /drivers/usb/core/hcd-pci.c | |
| parent | xhci: Resume bus on any port status change. (diff) | |
| download | linux-dev-0029227f1bc30b6c809ae751f9e7af6cef900997.tar.xz linux-dev-0029227f1bc30b6c809ae751f9e7af6cef900997.zip | |
xHCI: synchronize irq in xhci_suspend()
Synchronize the interrupts instead of free them in xhci_suspend(). This will
prevent a double free when the host is suspended and then the card removed.
Set the flag hcd->msix_enabled when using MSI-X, and check the flag in
suspend_common(). MSI-X synchronization will be handled by xhci_suspend(),
and MSI/INTx will be synchronized in suspend_common().
This patch should be queued for the 2.6.37 stable tree.
Reported-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
Diffstat (limited to 'drivers/usb/core/hcd-pci.c')
| -rw-r--r-- | drivers/usb/core/hcd-pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index b55d46070a25..f71e8e307e0f 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c @@ -405,7 +405,12 @@ static int suspend_common(struct device *dev, bool do_wakeup) return retval; } - synchronize_irq(pci_dev->irq); + /* If MSI-X is enabled, the driver will have synchronized all vectors + * in pci_suspend(). If MSI or legacy PCI is enabled, that will be + * synchronized here. + */ + if (!hcd->msix_enabled) + synchronize_irq(pci_dev->irq); /* Downstream ports from this root hub should already be quiesced, so * there will be no DMA activity. Now we can shut down the upstream |