diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 13:27:46 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 13:27:46 -0500 |
| commit | ac30aa596996a1e0bf1a8ff22bbdc24edaa24772 (patch) | |
| tree | 8944bae9ec65c7a5eff10f7b5b57ccbc4e206f1d | |
| parent | 43b90eaed57679731ae340a47cef49e59a321c2e (diff) | |
| parent | 5a1e0baa34fdf458a42e5ff99e3b04d909ba99ea (diff) | |
| download | talos-obmc-linux-ac30aa596996a1e0bf1a8ff22bbdc24edaa24772.tar.gz talos-obmc-linux-ac30aa596996a1e0bf1a8ff22bbdc24edaa24772.zip | |
Merge branch 'pci/msi'
- don't set up INTx if MSI or MSI-X is enabled to align cris, frv, ia64,
and mn10300 with x86 (Bjorn Helgaas)
* pci/msi:
PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled
| -rw-r--r-- | arch/ia64/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f5ec736100ee..7ccc64d5fe3e 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -398,7 +398,7 @@ pcibios_enable_device (struct pci_dev *dev, int mask) if (ret < 0) return ret; - if (!dev->msi_enabled) + if (!pci_dev_msi_enabled(dev)) return acpi_pci_irq_enable(dev); return 0; } @@ -407,7 +407,7 @@ void pcibios_disable_device (struct pci_dev *dev) { BUG_ON(atomic_read(&dev->enable_cnt)); - if (!dev->msi_enabled) + if (!pci_dev_msi_enabled(dev)) acpi_pci_irq_disable(dev); } |
