[PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels()

Subsystems: networking drivers, the rest, ti ethernet switch driver (cpsw)

STALE3641d

2 messages, 2 authors, 2016-08-27 · open the first message on its own page

[PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels()

From: Wei Yongjun <hidden>
Date: 2016-08-26 14:51:28

From: Wei Yongjun <redacted>

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 <redacted>
---
 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 */

Re: [PATCH -next] net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels()

From: David Miller <davem@davemloft.net>
Date: 2016-08-27 04:50:09

From: Wei Yongjun <redacted>
Date: Fri, 26 Aug 2016 14:35:43 +0000
From: Wei Yongjun <redacted>

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 <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help