Skip to contentSkip to conversation

net: stmmac: dwmac-rk: fix error path in rk_gmac_probe

PATCH In review Emil Renner Berthing 2 participants 2 messages Mar 21, 2020 – Mar 22, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: stmmac: dwmac-rk: fix error path in rk_gmac_probe

Make sure we clean up devicetree related configuration also when clock init fails.

Fixes fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support")
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1 -1
index dc50ba13a746..2d5573b3dee1 100644
@@ -1406,17 +1406,17 @@ static int rk_gmac_probe(struct platform_device *pdev)
 	plat_dat->bsp_priv = rk_gmac_setup(pdev, plat_dat, data);
 	if (IS_ERR(plat_dat->bsp_priv)) {
 		ret = PTR_ERR(plat_dat->bsp_priv);
 		goto err_remove_config_dt;
 	}
 
 	ret = rk_gmac_clk_init(plat_dat);
 	if (ret)
-		return ret;
+		goto err_remove_config_dt;
 
 	ret = rk_gmac_powerup(plat_dat->bsp_priv);
 	if (ret)
 		goto err_remove_config_dt;
 
 	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
 	if (ret)
 		goto err_gmac_powerdown;
Signature · 1 line
2.25.2
maintainer
#1 lore raw

From: Emil Renner Berthing <[email protected]>
Date: Sat, 21 Mar 2020 15:36:19 +0100

Quoted 5 lines

Make sure we clean up devicetree related configuration also when clock init fails.

Fixes fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support")

Applied and queued up for -stable, thank you.