---

yaml --- r: 174839 b: refs/heads/master c: b26a34a h: refs/heads/master i: 174837: 911d4f9 174835: 5b5d6d1 174831: 4a9a7b8 v: v3
git-mirror · Dec 5, 2009 · 896bd9a · 896bd9a
1 parent 81c2dea
commit 896bd9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 638bba08282fb50ba4ebde073ad70551b929e0f2
+refs/heads/master: b26a34aa4792b3db2500b8a98cb7702765c1a92e
diff --git a/trunk/drivers/pci/pcie/aspm.c b/trunk/drivers/pci/pcie/aspm.c
@@ -657,8 +657,10 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
 	free_link_state(link);
 
 	/* Recheck latencies and configure upstream links */
-	pcie_update_aspm_capable(root);
-	pcie_config_aspm_path(parent_link);
+	if (parent_link) {
+		pcie_update_aspm_capable(root);
+		pcie_config_aspm_path(parent_link);
+	}
 out:
 	mutex_unlock(&aspm_lock);
 	up_read(&pci_bus_sem);