diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 04:22:57 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 04:22:57 (GMT) |
commit | b5831174f9d3f12a492deda6374ca96f87b694f8 (patch) | |
tree | 96aa46239200021f9545bda5836f7e80a640d88b /drivers/pci/pcie/aspm.c | |
parent | 40a1ef95da85843696fc3ebe5fce39b0db32669f (diff) | |
parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
download | linux-fsl-qoriq-b5831174f9d3f12a492deda6374ca96f87b694f8.tar.xz |
Merge tag 'v3.8-rc6' into x86/urgent
Linux 3.8-rc6
Merged in order to add a documentation update versus new code in
upstream.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/pci/pcie/aspm.c')
-rw-r--r-- | drivers/pci/pcie/aspm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index b52630b..8474b6a 100644 --- 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 */ |