1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index f289ca9bf18d..5b7056cec00c 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -303,9 +303,6 @@ static void pcie_get_aspm_reg(struct pci_dev *pdev,
         pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
         pci_read_config_dword(pdev, pos + PCI_EXP_LNKCAP, &reg32);
         info->support = (reg32 & PCI_EXP_LNKCAP_ASPMS) >> 10;
-        /* 00b and 10b are defined as "Reserved". */
-        if (info->support == PCIE_LINK_STATE_L1)
-                info->support = 0;
         info->latency_encoding_l0s = (reg32 & PCI_EXP_LNKCAP_L0SEL) >> 12;
         info->latency_encoding_l1  = (reg32 & PCI_EXP_LNKCAP_L1EL) >> 15;
         pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &reg16);
@@ -659,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);