From: Wang Hai <wanghai38@huawei.com>
To: <hayashi.kunihiko@socionext.com>, <davem@davemloft.net>,
<kuba@kernel.org>, <p.zabel@pengutronix.de>,
<yamada.masahiro@socionext.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<wanghai38@huawei.com>
Subject: [PATCH] net: ethernet: ave: Fix error returns in ave_init
Date: Fri, 17 Jul 2020 10:50:49 +0800 [thread overview]
Message-ID: <20200717025049.43027-1-wanghai38@huawei.com> (raw)
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@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.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
next reply other threads:[~2020-07-17 2:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 2:50 Wang Hai [this message]
2020-07-17 4:16 ` [PATCH] net: ethernet: ave: Fix error returns in ave_init Kunihiko Hayashi
2020-07-22 1:32 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200717025049.43027-1-wanghai38@huawei.com \
--to=wanghai38@huawei.com \
--cc=davem@davemloft.net \
--cc=hayashi.kunihiko@socionext.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.