Skip to content

Commit 4d3d3a1

Browse files
Dan Carpenterkuba-moo
authored andcommitted
stmmac: dwmac-mediatek: fix resource leak in probe
If mediatek_dwmac_clks_config() fails, then call stmmac_remove_config_dt() before returning. Otherwise it is a resource leak. Fixes: fa4b3ca ("stmmac: dwmac-mediatek: fix clock issue") Signed-off-by: Dan Carpenter <[email protected]> Link: https://lore.kernel.org/r/YuJ4aZyMUlG6yGGa@kili Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 85f0173 commit 4d3d3a1

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -688,18 +688,19 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)
688688

689689
ret = mediatek_dwmac_clks_config(priv_plat, true);
690690
if (ret)
691-
return ret;
691+
goto err_remove_config_dt;
692692

693693
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
694-
if (ret) {
695-
stmmac_remove_config_dt(pdev, plat_dat);
694+
if (ret)
696695
goto err_drv_probe;
697-
}
698696

699697
return 0;
700698

701699
err_drv_probe:
702700
mediatek_dwmac_clks_config(priv_plat, false);
701+
err_remove_config_dt:
702+
stmmac_remove_config_dt(pdev, plat_dat);
703+
703704
return ret;
704705
}
705706

0 commit comments

Comments
 (0)