Merge branch 'pci/misc' into next

* pci/misc: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
git-mirror · Mar 19, 2014 · 91b4adc · 91b4adc
2 parents 2c0503f + 866d541
commit 91b4adc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
@@ -1192,6 +1192,9 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
 		return err;
 	pci_fixup_device(pci_fixup_enable, dev);
 
+	if (dev->msi_enabled || dev->msix_enabled)
+		return 0;
+
 	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
 	if (pin) {
 		pci_read_config_word(dev, PCI_COMMAND, &cmd);