Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faebc1a2 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

PCI: qcom: Fix unbalanced PHY init on probe errors 

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: 82a82383 ("PCI: qcom: Add Qualcomm PCIe controller driver")
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: default avatarStanimir Varbanov <svarbanov@mm-sol.com>
Cc: stable@vger.kernel.org      # 4.5
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6630c799

drivers/pci/host/pcie-qcom.c

+6 −1
Original line number Diff line number Diff line
@@ -562,10 +562,15 @@ static int qcom_pcie_probe(struct platform_device *pdev) 
	ret = dw_pcie_host_init(pp);

	if (ret) {

		dev_err(dev, "cannot initialize host\n");

		return ret;

		goto err_phy_exit;

	}



	return 0;



err_phy_exit:

	phy_exit(pcie->phy);



	return ret;

}



static const struct of_device_id qcom_pcie_match[] = {