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.10 370/452] PCI: qcom: Fix unbalanced PHY init on probe errors
    Date
    From: Johan Hovold <johan+linaro@kernel.org>

    commit 83013631f0f9961416abd812e228c8efbc2f6069 upstream.

    Undo the PHY initialisation (e.g. balance runtime PM) if host
    initialisation fails during probe.

    Link: https://lore.kernel.org/r/20220401133854.10421-3-johan+linaro@kernel.org
    Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver")
    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.5
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pci/controller/dwc/pcie-qcom.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/pci/controller/dwc/pcie-qcom.c
    +++ b/drivers/pci/controller/dwc/pcie-qcom.c
    @@ -1451,11 +1451,13 @@ static int qcom_pcie_probe(struct platfo
    ret = dw_pcie_host_init(pp);
    if (ret) {
    dev_err(dev, "cannot initialize host\n");
    - goto err_pm_runtime_put;
    + goto err_phy_exit;
    }

    return 0;

    +err_phy_exit:
    + phy_exit(pcie->phy);
    err_pm_runtime_put:
    pm_runtime_put(dev);
    pm_runtime_disable(dev);

    \
     
     \ /
      Last update: 2022-06-07 20:04    [W:4.187 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site