Skip to content

Commit

Permalink
Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is …
Browse files Browse the repository at this point in the history
…set"

This reverts commit 17c9148.

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: 17c9148 ("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>
  • Loading branch information
Bjorn Helgaas committed Dec 4, 2018
1 parent c74eadf commit b07b864
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pci/pcie/aspm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b07b864

Please sign in to comment.