leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pci/msi'

Browse Source 
- 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
This commit is contained in:
Bjorn Helgaas 2018-04-04 13:27:46 -05:00 committed by Bjorn Helgaas
commit ac30aa5969
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/pci/pci.c
View File

@ -398,7 +398,7 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!dev->msi_enabled) if (!pci_dev_msi_enabled(dev))
return acpi_pci_irq_enable(dev); return acpi_pci_irq_enable(dev);
return 0; return 0;
} }
@ -407,7 +407,7 @@ void
pcibios_disable_device (struct pci_dev *dev) pcibios_disable_device (struct pci_dev *dev)
{ {
BUG_ON(atomic_read(&dev->enable_cnt)); BUG_ON(atomic_read(&dev->enable_cnt));
if (!dev->msi_enabled) if (!pci_dev_msi_enabled(dev))
acpi_pci_irq_disable(dev); acpi_pci_irq_disable(dev);
} }