lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 756/879] PCI: qcom: Fix runtime PM imbalance on probe errors
    Date
    From: Johan Hovold <johan+linaro@kernel.org>

    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: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pci/controller/dwc/pcie-qcom.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    --- a/drivers/pci/controller/dwc/pcie-qcom.c
    +++ b/drivers/pci/controller/dwc/pcie-qcom.c
    @@ -1621,17 +1621,14 @@ static int qcom_pcie_probe(struct platfo
    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;
    }


    \
     
     \ /
      Last update: 2022-06-08 02:21    [W:2.198 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site