summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-03-19 15:11:03 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-03-19 15:11:03 -0600
commit91b4adc983d8e9975bc677c2b8395631edf7b92d (patch)
tree4ab17c01721a0a9c0a7bdf07a4e53cf049ef6d19 /drivers/pci
parent2c0503f202f597325baae76e9f5686518e5ed0dd (diff)
parent866d54177b4e671cd52bed1fb487d140d7b691f5 (diff)
downloadlinux-91b4adc983d8e9975bc677c2b8395631edf7b92d.tar.bz2
Merge branch 'pci/misc' into next
* pci/misc: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b6ddde1d04ca..505fbb670d6a 100644
--- 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);