Merge branch 'pci/misc' into next
* pci/misc: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
This commit is contained in:
commit
91b4adc983
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue