diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-01-05 14:50:27 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 11:13:25 -0800 |
| commit | 16cf0ebc35dd63f72628ba1246132a6fd17bced2 (patch) | |
| tree | 502bfcaac930695eb7f4ff8d7748f913b9accb83 /arch | |
| parent | ef1bba28bfe68ef3c0488feeaabd3e8bc523130c (diff) | |
| download | linux-16cf0ebc35dd63f72628ba1246132a6fd17bced2.tar.gz linux-16cf0ebc35dd63f72628ba1246132a6fd17bced2.tar.bz2 linux-16cf0ebc35dd63f72628ba1246132a6fd17bced2.zip | |
x86/PCI: Do not use interrupt links for devices using MSI-X
pcibios_enable_device() and pcibios_disable_device() don't handle
IRQs for devices that have MSI enabled and it should treat the
devices with MSI-X enabled in the same way.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/pci/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 9ab8509f7b15..82d22fc601ae 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -551,14 +551,14 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if ((err = pci_enable_resources(dev, mask)) < 0) return err; - if (!dev->msi_enabled) + if (!pci_dev_msi_enabled(dev)) return pcibios_enable_irq(dev); return 0; } void pcibios_disable_device (struct pci_dev *dev) { - if (!dev->msi_enabled && pcibios_disable_irq) + if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq) pcibios_disable_irq(dev); } |