Commit e369273f authored by Kamal Mostafa's avatar Kamal Mostafa

[3.13-stable] Revert "PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled"

This reverts commit 16d36cdf.

... which was applied to 3.13-stable twice, first as:
        bb7048ea
and then again as:
        16d36cdf

This revert relates only to 3.13-stable, and the fix itself remains in 3.13.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 82589b6b
...@@ -1131,9 +1131,6 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars) ...@@ -1131,9 +1131,6 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
return err; return err;
pci_fixup_device(pci_fixup_enable, dev); pci_fixup_device(pci_fixup_enable, dev);
if (dev->msi_enabled || dev->msix_enabled)
return 0;
if (dev->msi_enabled || dev->msix_enabled) if (dev->msi_enabled || dev->msix_enabled)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment