diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2018-12-03 18:05:17 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-12-03 18:05:17 -0600 |
| commit | b07b864ee4232b03125992a8f6a490b040adcb6a (patch) | |
| tree | 90ab83706438b562219aa9dccba6fb2ff4828798 | |
| parent | Merge remote-tracking branch 'lorenzo/pci/controller-fixes' into for-linus (diff) | |
| download | linux-dev-b07b864ee4232b03125992a8f6a490b040adcb6a.tar.xz linux-dev-b07b864ee4232b03125992a8f6a490b040adcb6a.zip | |
Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set"
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>
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index dcb29cb76dc6..f78860ce884b 100644 --- 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) |