diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-07 12:58:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-07 12:58:34 -0800 |
| commit | 7b24f6c082b3777749ccd19c9beb8643fa718480 (patch) | |
| tree | 05bd01d84b2856d7985e34c4cd95d3d644c6f42e | |
| parent | Merge tag 'for-linus-20181207' of git://git.kernel.dk/linux-block (diff) | |
| parent | Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set" (diff) | |
| download | linux-dev-7b24f6c082b3777749ccd19c9beb8643fa718480.tar.xz linux-dev-7b24f6c082b3777749ccd19c9beb8643fa718480.zip | |
Merge tag 'pci-v4.20-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Revert ASPM change that caused a regression"
* tag 'pci-v4.20-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set"
| -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) |