From e19ac1578fd8eb3f7c93f2be2657deb2ccefffd7 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Fri, 26 Aug 2016 14:35:43 +0000
Subject: [PATCH] net: ethernet: ti: cpsw: fix error return code in
cpsw_set_channels()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
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 4273e7f9b4aaf..c6cff3d2ff050 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 */
--
2.30.2