xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: qcom: Fix runtime PM imbalance on probe errors

Browse Source 
commit 87d83b96c8d6c6c2d2096bd0bdba73bcf42b8ef0 upstream.

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: 6e5da6f7d8 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold
2022-04-01 15:38:53 +02:00
committed by Greg Kroah-Hartman
parent 2b4c6ad382
commit c0e129dafc
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pci/controller/dwc/pcie-qcom.c
View File

@@ -1443,17 +1443,14 @@ static int qcom_pcie_probe(struct platform_device *pdev)
} }
ret = phy_init(pcie->phy); ret = phy_init(pcie->phy);
if (ret) { if (ret)
pm_runtime_disable(&pdev->dev);
goto err_pm_runtime_put; goto err_pm_runtime_put;
}
platform_set_drvdata(pdev, pcie); platform_set_drvdata(pdev, pcie);
ret = dw_pcie_host_init(pp); ret = dw_pcie_host_init(pp);
if (ret) { if (ret) {
dev_err(dev, "cannot initialize host\n"); dev_err(dev, "cannot initialize host\n");
pm_runtime_disable(&pdev->dev);
goto err_pm_runtime_put; goto err_pm_runtime_put;
} }