Re: [PATCH v2 1/2] PCI: qcom: Fix runtime PM imbalance on probe errors

Manivannan Sadhasivam
2022-04-27T07:55:09Z

On Fri, Apr 01, 2022 at 03:38:53PM +0200, Johan Hovold wrote:
> 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.
>
> Fixes: 6e5da6f7d824 ("PCI: qcom: Fix error handling in runtime PM support")
> Cc: stable@vger.kernel.org # 4.20
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>

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

Thanks,
Mani

> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 20a0e6533a1c..0b0bd71f1bd2 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -1616,17 +1616,14 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> pp->ops = &qcom_pcie_dw_ops;
>
> 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;
> }
>
> --
> 2.35.1
>