projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c74eadf
)
Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set"
author
Bjorn Helgaas
<bhelgaas@google.com>
Tue, 4 Dec 2018 00:05:17 +0000
(18:05 -0600)
committer
Bjorn Helgaas
<bhelgaas@google.com>
Tue, 4 Dec 2018 00:05:17 +0000
(18:05 -0600)
This reverts commit
17c91487364fb33797ed84022564ee7544ac4945
.
Rafael found that this commit broke the SD card reader in his
Acer Aspire S5. Details of the problem are in the bugzilla below.
Fixes: 17c91487364f ("PCI/ASPM: Do not initialize link state when aspm_disabled is set")
Link:
https://bugzilla.kernel.org/show_bug.cgi?id=201801
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/pcie/aspm.c
patch
|
blob
|
history
diff --git
a/drivers/pci/pcie/aspm.c
b/drivers/pci/pcie/aspm.c
index dcb29cb76dc69d1a958f4ae25732048b7532e549..f78860ce884bc531860bba73bce96b83f1c444ae 100644
(file)
--- a/
drivers/pci/pcie/aspm.c
+++ b/
drivers/pci/pcie/aspm.c
@@
-895,7
+895,7
@@
void pcie_aspm_init_link_state(struct pci_dev *pdev)
struct pcie_link_state *link;
int blacklist = !!pcie_aspm_sanity_check(pdev);
- if (!aspm_support_enabled
|| aspm_disabled
)
+ if (!aspm_support_enabled)
return;
if (pdev->link_state)