From: Johan Hovold <johan+linaro@kernel.org>

Date: Fri, 1 Apr 2022 15:38:53 +0200

Subject: PCI: qcom: Fix runtime PM imbalance on probe errors

Git-commit: 87d83b96c8d6c6c2d2096bd0bdba73bcf42b8ef0

Patch-mainline: v5.19-rc1

References: git-fixes

Drop the leftover pm_runtime_disable() calls from the late probe error

paths that would, for example, prevent runtime PM from being reenabled

after a probe deferral.

Link: https://lore.kernel.org/r/20220401133854.10421-2-johan+linaro@kernel.org

Fixes: 6e5da6f7d824 ("PCI: qcom: Fix error handling in runtime PM support")

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>

Cc: stable@vger.kernel.org      # 4.20

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>

---

 drivers/pci/dwc/pcie-qcom.c |    5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/drivers/pci/dwc/pcie-qcom.c

+++ b/drivers/pci/dwc/pcie-qcom.c

@@ -1394,17 +1394,14 @@ static int qcom_pcie_probe(struct platfo

 	}

 	ret = phy_init(pcie->phy);

-	if (ret) {

-		pm_runtime_disable(&pdev->dev);

+	if (ret)

 		goto err_pm_runtime_put;

-	}

 	platform_set_drvdata(pdev, pcie);

 	ret = dw_pcie_host_init(pp);

 	if (ret) {

 		dev_err(dev, "cannot initialize host\n");

-		pm_runtime_disable(&pdev->dev);

 		goto err_pm_runtime_put;

 	}