Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set"

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Bjorn Helgaas 7 years ago b07b864e c74eadf8

+1 -1

1 changed file

expand all

drivers

pci

pcie

aspm.c

+1 -1

drivers/pci/pcie/aspm.c

··· 895 895 struct pcie_link_state *link; 896 896 int blacklist = !!pcie_aspm_sanity_check(pdev); 897 897 898 - if (!aspm_support_enabled || aspm_disabled) 898 + if (!aspm_support_enabled) 899 899 return; 900 900 901 901 if (pdev->link_state)