Merge branch 'topic/pcm-dma-fix' into topic/core-change

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 745402e8e498..5b7056cec00c 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -656,8 +656,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);