diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-13 01:53:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-13 01:53:37 -0400 |
| commit | 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa (patch) | |
| tree | 9370e8fd969fa20fbb1b8e01f2095335f5787ade | |
| parent | 212ad2f5f9287e019b61da5bb0409a6094161f5c (diff) | |
| parent | 4949be16822e92a18ea0cc1616319926628092ee (diff) | |
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
| -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 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) | |||
| 500 | int pos; | 500 | int pos; |
| 501 | u32 reg32; | 501 | u32 reg32; |
| 502 | 502 | ||
| 503 | if (aspm_disabled) | ||
| 504 | return 0; | ||
| 505 | |||
| 503 | /* | 506 | /* |
| 504 | * Some functions in a slot might not all be PCIe functions, | 507 | * Some functions in a slot might not all be PCIe functions, |
| 505 | * very strange. Disable ASPM for the whole slot | 508 | * very strange. Disable ASPM for the whole slot |