From: Wei Yongjun <weiyj.lk@gmail.com>
To: Mugunthan V N <mugunthanvnm@ti.com>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Cc: Wei Yongjun <weiyongjun1@huawei.com>,
linux-omap@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels()
Date: Fri, 26 Aug 2016 14:35:43 +0000 [thread overview]
Message-ID: <1472222143-3604-1-git-send-email-weiyj.lk@gmail.com> (raw)
From: Wei Yongjun <weiyongjun1@huawei.com>
Fix to return a negative error code from the cpsw_fill_rx_channels()
error handling case instead of 0, as done elsewhere in this function.
Fixes: ce52c744574b ("net: ethernet: ti: cpsw: add ethtool channels support")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/ethernet/ti/cpsw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 4273e7f..c6cff3d 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2217,7 +2217,8 @@ static int cpsw_set_channels(struct net_device *ndev,
}
if (cpsw_common_res_usage_state(cpsw)) {
- if (cpsw_fill_rx_channels(priv))
+ ret = cpsw_fill_rx_channels(priv);
+ if (ret)
goto err;
/* After this receive is started */
next reply other threads:[~2016-08-26 14:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-26 14:35 Wei Yongjun [this message]
2016-08-27 4:50 ` [PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels() 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=1472222143-3604-1-git-send-email-weiyj.lk@gmail.com \
--to=weiyj.lk@gmail.com \
--cc=grygorii.strashko@ti.com \
--cc=ivan.khoronzhuk@linaro.org \
--cc=linux-omap@vger.kernel.org \
--cc=mugunthanvnm@ti.com \
--cc=netdev@vger.kernel.org \
--cc=weiyongjun1@huawei.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 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).