Merge tag 'pci-v6.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

[J-linux.git] / drivers / pci / controller / dwc / pcie-qcom.c

diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index cd986f50ec4a481141737b9c30e6a917931ad0b8..10f2d0bb86bec008e82e6a86211161c693ae568e 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -968,9 +968,12 @@ static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie)
 
 static int qcom_pcie_enable_aspm(struct pci_dev *pdev, void *userdata)
 {
-       /* Downstream devices need to be in D0 state before enabling PCI PM substates */
+       /*
+        * Downstream devices need to be in D0 state before enabling PCI PM
+        * substates.
+        */
        pci_set_power_state(pdev, PCI_D0);
-       pci_enable_link_state(pdev, PCIE_LINK_STATE_ALL);
+       pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL);
 
        return 0;
 }