summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-13 09:53:37 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-13 09:53:37 +0400
commit0ae5eaf1032ca3cd5a0097f72992fc4821c762fa (patch)
tree9370e8fd969fa20fbb1b8e01f2095335f5787ade /drivers
parent212ad2f5f9287e019b61da5bb0409a6094161f5c (diff)
parent4949be16822e92a18ea0cc1616319926628092ee (diff)
downloadlinux-0ae5eaf1032ca3cd5a0097f72992fc4821c762fa.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
Pull PCI changes from Jesse Barnes: "A single fix for a regression that affects some people who try to disable ASPM for whatever reason." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pcie/aspm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 1cfbf228fbb1..24f049e73952 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
int pos;
u32 reg32;
+ if (aspm_disabled)
+ return 0;
+
/*
* Some functions in a slot might not all be PCIe functions,
* very strange. Disable ASPM for the whole slot