On Fri, Apr 01, 2022 at 03:38:54PM +0200, Johan Hovold wrote:
Make sure to undo the PHY initialisation (e.g. balance runtime PM) in case host initialisation fails during probe.
Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Cc: stable@vger.kernel.org # 4.5 Cc: Stanimir Varbanov svarbanov@mm-sol.com 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 0b0bd71f1bd2..df47986bda29 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1624,11 +1624,13 @@ static int qcom_pcie_probe(struct platform_device *pdev) 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); -- 2.35.1