git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
[pandora-kernel.git]
/
drivers
/
pci
/
pcie
/
aspm.c
diff --git
a/drivers/pci/pcie/aspm.c
b/drivers/pci/pcie/aspm.c
index
1cfbf22
..
24f049e
100644
(file)
--- 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