diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-03-19 17:11:03 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-03-19 17:11:03 -0400 |
| commit | 91b4adc983d8e9975bc677c2b8395631edf7b92d (patch) | |
| tree | 4ab17c01721a0a9c0a7bdf07a4e53cf049ef6d19 | |
| parent | 2c0503f202f597325baae76e9f5686518e5ed0dd (diff) | |
| parent | 866d54177b4e671cd52bed1fb487d140d7b691f5 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
| -rw-r--r-- | drivers/pci/pci.c | 3 |
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) | |||
| 1192 | return err; | 1192 | return err; |
| 1193 | pci_fixup_device(pci_fixup_enable, dev); | 1193 | pci_fixup_device(pci_fixup_enable, dev); |
| 1194 | 1194 | ||
| 1195 | if (dev->msi_enabled || dev->msix_enabled) | ||
| 1196 | return 0; | ||
| 1197 | |||
| 1195 | pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); | 1198 | pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); |
| 1196 | if (pin) { | 1199 | if (pin) { |
| 1197 | pci_read_config_word(dev, PCI_COMMAND, &cmd); | 1200 | pci_read_config_word(dev, PCI_COMMAND, &cmd); |