From 896bd9a4fef00ad0604dc75fc6f659fbb62d5cb1 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Fri, 6 Nov 2009 11:25:13 +0900
Subject: [PATCH] --- yaml --- r: 174839 b: refs/heads/master c:
 b26a34aa4792b3db2500b8a98cb7702765c1a92e h: refs/heads/master i:   174837:
 911d4f9e36f9217778fd3b9efa9bc81a2ac0bb0e   174835:
 5b5d6d1373cce30e6a5aced90c6c708032f1c189   174831:
 4a9a7b88786d48bb2ea5937d4281bf71a27b5de6 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/pcie/aspm.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e9fa0d23bd28..fc0658db0131 100644
--- 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
index 05b8e25b551b..5a01fc7fbf05 100644
--- 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);