[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200717025049.43027-1-wanghai38@huawei.com>
Date: Fri, 17 Jul 2020 10:50:49 +0800
From: Wang Hai <wanghai38@...wei.com>
To: <hayashi.kunihiko@...ionext.com>, <davem@...emloft.net>,
<kuba@...nel.org>, <p.zabel@...gutronix.de>,
<yamada.masahiro@...ionext.com>
CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<wanghai38@...wei.com>
Subject: [PATCH] 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.
Fixes: 57878f2f4697 ("net: ethernet: ave: add support for phy-mode setting of system controller")
Reported-by: Hulk Robot <hulkci@...wei.com>
Signed-off-by: Wang Hai <wanghai38@...wei.com>
---
drivers/net/ethernet/socionext/sni_ave.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c
index f2638446b62e..81b554dd7221 100644
--- a/drivers/net/ethernet/socionext/sni_ave.c
+++ b/drivers/net/ethernet/socionext/sni_ave.c
@@ -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);
--
2.17.1
Powered by blists - more mailing lists