---
 drivers/pci/pcie/aspm.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -85,15 +85,7 @@
 	struct pci_cap_saved_state *save_state;
 	u32 *cap;
 
-	/*
-	 * If this is a Downstream Port, we never restore the L1SS state
-	 * directly; we only restore it when we restore the state of the
-	 * Upstream Port below it.
-	 */
-	if (pcie_downstream_port(pdev) || !parent)
-		return;
-
-	if (!pdev->l1ss || !parent->l1ss)
+	if (!pdev->l1ss)
 		return;
 
 	/*
@@ -108,7 +100,7 @@
 	pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CTL2, cap++);
 	pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CTL1, cap++);
 
-	if (parent->state_saved)
+	if (!parent || parent->state_saved || !parent->l1ss)
 		return;
 
 	/*