net: ethernet: ave: Fix error returns in ave_init
Subsystems (3)
PATCH 1/1 net: ethernet: ave: Fix error returns in ave_init
When regmap_update_bits failed in ave_init(), calls of the functions reset_control_assert() and clk_disable_unprepare() were missed. Add goto out_reset_assert to do this.
--- drivers/net/ethernet/socionext/sni_ave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/socionext/sni_ave.c +1 -1
@@ -1191,7 +1191,7 @@ static int ave_init(struct net_device *ndev) ret =regmap_update_bits (priv->regmap,SG_ETPINMODE , priv->pinmode_mask, priv->pinmode_val);if (ret) -return ret; + goto out_reset_assert;ave_global_reset (ndev);
Signature · 1 line
2.17.1
Hi Wang,
Quoted 17 lines · Wang Hai
When
regmap_update_bitsfailed inave_init(), calls of the functionsreset_control_assert()andclk_disable_unprepare()were missed. Add gotoout_reset_assertto do this.Fixes 57878f2f4697 ("net: ethernet: ave: add support for phy-mode setting of system controller")Reported-by Hulk Robot <[email protected]>Signed-off-by Wang Hai <[email protected]>--- drivers/net/ethernet/socionext/sni_ave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/socionext/sni_ave.c +0
-0
drivers/net/ethernet/socionext/sni_ave.c static int ave_init(struct net_device *ndev) · line 1197
Quoted 8 lines
drivers/net/ethernet/socionext/sni_ave.c +1
-1@@ -1191,7 +1191,7 @@ static int ave_init(struct net_device *ndev) ret =regmap_update_bits (priv->regmap,SG_ETPINMODE , priv->pinmode_mask, priv->pinmode_val);if (ret) -return ret; + goto out_reset_assert;ave_global_reset (ndev);
Thank you for pointing out.
---
Best Regards
Kunihiko Hayashi
From: Wang Hai <[email protected]>
Date: Fri, 17 Jul 2020 10:50:49 +0800
Quoted 7 lines
When
regmap_update_bitsfailed inave_init(), calls of the functionsreset_control_assert()andclk_disable_unprepare()were missed. Add gotoout_reset_assertto do this.Fixes 57878f2f4697 ("net: ethernet: ave: add support for phy-mode setting of system controller")Reported-by Hulk Robot <[email protected]>Signed-off-by Wang Hai <[email protected]>
Applied.