Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ae5eaf1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 

Pull PCI changes from Jesse Barnes:
 "A single fix for a regression that affects some people who try to
  disable ASPM for whatever reason."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled
parents 212ad2f5 4949be16

drivers/pci/pcie/aspm.c

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) 
	int pos;

	u32 reg32;



	if (aspm_disabled)

		return 0;



	/*

	 * Some functions in a slot might not all be PCIe functions,

	 * very strange. Disable ASPM for the whole slot