Unverified Commit 5b04d44d authored by Frank Li's avatar Frank Li Committed by Krzysztof Wilczyński
Browse files

PCI: imx6: Fix missing call to phy_power_off() in error handling 

Fix missing call to phy_power_off() in the error path of
imx6_pcie_host_init(). Remove unnecessary check for imx6_pcie->phy
as the PHY API already handles NULL pointers.

Fixes: cbcf8722 ("phy: freescale: imx8m-pcie: Fix the wrong order of phy_init() and phy_power_on()")
Link: https://lore.kernel.org/linux-pci/20240729-pci2_upstream-v8-3-b68ee5ef2b4d@nxp.com


Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
[kwilczynski: commit log]
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: <stable@vger.kernel.org> # 6.1+
parent 5cb3aa92

drivers/pci/controller/dwc/pci-imx6.c

+4 −3
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ static int imx6_pcie_host_init(struct dw_pcie_rp *pp) 
		ret = phy_power_on(imx6_pcie->phy);

		if (ret) {

			dev_err(dev, "waiting for PHY ready timeout!\n");

			goto err_phy_off;

			goto err_phy_exit;

		}

	}
@@ -968,7 +968,8 @@ static int imx6_pcie_host_init(struct dw_pcie_rp *pp) 
	return 0;



err_phy_off:

	if (imx6_pcie->phy)

	phy_power_off(imx6_pcie->phy);

err_phy_exit:

	phy_exit(imx6_pcie->phy);

err_clk_disable:

	imx6_pcie_clk_disable(imx6_pcie);