From 1741ff257848dd714ff8161d846fb2e994d7d75d Mon Sep 17 00:00:00 2001 From: Joe Lawrence Date: Tue, 15 Jan 2013 15:31:28 -0500 Subject: [PATCH] --- yaml --- r: 358425 b: refs/heads/master c: a26d5ecb3201c11e03663a8f4a7dedc0c5f85c07 h: refs/heads/master i: 358423: 826a60fd5e59d8d370923b002d757dc03e828e6d v: v3 --- [refs] | 2 +- trunk/drivers/pci/pcie/aspm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a4d764756a63..e039509a8ea3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84fb913c43475e0d1e061220ef4622e3e82e91d6 +refs/heads/master: a26d5ecb3201c11e03663a8f4a7dedc0c5f85c07 diff --git a/trunk/drivers/pci/pcie/aspm.c b/trunk/drivers/pci/pcie/aspm.c index ca44115ca1f1..e8a19772cf52 100644 --- a/trunk/drivers/pci/pcie/aspm.c +++ b/trunk/drivers/pci/pcie/aspm.c @@ -556,6 +556,9 @@ 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) + return; + if (!pci_is_pcie(pdev) || pdev->link_state) return; if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&