Commit ac30aa59 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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
parents 43b90eae 5a1e0baa

arch/ia64/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}