* [PATCH] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe
@ 2020-03-21 14:36 Emil Renner Berthing
2020-03-22 2:59 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Emil Renner Berthing @ 2020-03-21 14:36 UTC (permalink / raw)
To: netdev
Cc: David Wu, Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, linux-rockchip, linux-arm-kernel, linux-kernel,
Emil Renner Berthing
Make sure we clean up devicetree related configuration
also when clock init fails.
Fixes: fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support")
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index dc50ba13a746..2d5573b3dee1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -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;
--
2.25.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe
2020-03-21 14:36 [PATCH] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe Emil Renner Berthing
@ 2020-03-22 2:59 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-03-22 2:59 UTC (permalink / raw)
To: kernel
Cc: netdev, david.wu, peppe.cavallaro, alexandre.torgue, joabreu,
linux-rockchip, linux-arm-kernel, linux-kernel
From: Emil Renner Berthing <kernel@esmil.dk>
Date: Sat, 21 Mar 2020 15:36:19 +0100
> Make sure we clean up devicetree related configuration
> also when clock init fails.
>
> Fixes: fecd4d7eef8b ("net: stmmac: dwmac-rk: Add integrated PHY support")
> Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-22 2:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-21 14:36 [PATCH] net: stmmac: dwmac-rk: fix error path in rk_gmac_probe Emil Renner Berthing
2020-03-22 2:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).