3.13.11.1 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Kamal Mostafa <[email protected]> This reverts commit 16d36cdf2bd2b8e821ea1286dd3e8b2d657e6b3c. ... which was applied to 3.13-stable twice, first as: bb7048ea362773c2b53ee410a69ff60a029c71ef and then again as: 16d36cdf2bd2b8e821ea1286dd3e8b2d657e6b3c This revert relates only to 3.13-stable, and the fix itself remains in 3.13. Cc: Bjorn Helgaas <[email protected]> Cc: Sarah Sharp <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> --- drivers/pci/pci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 6f01c74..1a8a4fd 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1134,9 +1134,6 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars) if (dev->msi_enabled || dev->msix_enabled) return 0; - 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); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
