Commit 7b24f6c0 authored Dec 07, 2018 by Linus Torvalds

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"

parents 0b43a299 b07b864e

drivers/pci/pcie/aspm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

Admin message