Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[~andy/linux] / drivers / pci / pcie / aspm.c

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index e8a19772cf52544ca6b87f44efb4038b3b8fe979..d320df6375a2c807f8a45a8badc247bf16a956bf 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus)
 {
        struct pci_dev *child;
 
+       if (aspm_force)
+               return;
+
        /*
         * Clear any ASPM setup that the firmware has carried out on this bus
         */