mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-25 19:07:46 +00:00
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
This commit is contained in:
commit
ac30aa5969
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user