* [PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels()
@ 2016-08-26 14:35 Wei Yongjun
2016-08-27 4:50 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-08-26 14:35 UTC (permalink / raw)
To: Mugunthan V N, Grygorii Strashko, Ivan Khoronzhuk
Cc: Wei Yongjun, linux-omap, netdev
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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-27 4:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-26 14:35 [PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels() Wei Yongjun
2016-08-27 4:50 ` 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).