shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
commit 5b04d44d5c74e4d8aab1678496b84700b4b343fe upstream.

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: cbcf8722b5 ("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: Frank Li <Frank.Li@nxp.com>
[kwilczynski: commit log]
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: <stable@vger.kernel.org> # 6.1+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Frank Li
2024-07-29 16:18:10 -04:00
committed by Greg Kroah-Hartman
parent 6a58b8ce51
commit c5f3592f2b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pci/controller/dwc/pci-imx6.c
View File

@@ -956,7 +956,7 @@ static int imx6_pcie_host_init(struct dw_pcie_rp *pp)
ret = phy_power_on(imx6_pcie->phy); ret = phy_power_on(imx6_pcie->phy);
if (ret) { if (ret) {
dev_err(dev, "waiting for PHY ready timeout!\n"); dev_err(dev, "waiting for PHY ready timeout!\n");
goto err_phy_off; goto err_phy_exit;
} }
} }
@@ -971,8 +971,9 @@ static int imx6_pcie_host_init(struct dw_pcie_rp *pp)
return 0; return 0;
err_phy_off: err_phy_off:
if (imx6_pcie->phy) phy_power_off(imx6_pcie->phy);
phy_exit(imx6_pcie->phy); err_phy_exit:
phy_exit(imx6_pcie->phy);
err_clk_disable: err_clk_disable:
imx6_pcie_clk_disable(imx6_pcie); imx6_pcie_clk_disable(imx6_pcie);
err_reg_disable: err_reg_disable: