[v2,net-next] net: ethernet: ti: cpsw: correct .ndo_open error path
diff mbox series

Message ID 20190528174519.7370-1-ivan.khoronzhuk@linaro.org
State Accepted
Commit 02caceded0691a31a21b62011da8dae0d3aec85b
Headers show
Series
  • [v2,net-next] net: ethernet: ti: cpsw: correct .ndo_open error path
Related show

Commit Message

Ivan Khoronzhuk May 28, 2019, 5:45 p.m. UTC
It's found while review and probably never happens, but real number
of queues is set per device, and error path should be per device.
So split error path based on usage_count.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
---
 drivers/net/ethernet/ti/cpsw.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

David Miller May 30, 2019, 4:50 a.m. UTC | #1
From: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Date: Tue, 28 May 2019 20:45:19 +0300

> It's found while review and probably never happens, but real number
> of queues is set per device, and error path should be per device.
> So split error path based on usage_count.
> 
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>

Applied, thanks.

Patch
diff mbox series

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 634fc484a0b3..6d3f1f3f90cb 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1423,8 +1423,11 @@  static int cpsw_ndo_open(struct net_device *ndev)
 	return 0;
 
 err_cleanup:
-	cpdma_ctlr_stop(cpsw->dma);
-	for_each_slave(priv, cpsw_slave_stop, cpsw);
+	if (!cpsw->usage_count) {
+		cpdma_ctlr_stop(cpsw->dma);
+		for_each_slave(priv, cpsw_slave_stop, cpsw);
+	}
+
 	pm_runtime_put_sync(cpsw->dev);
 	netif_carrier_off(priv->ndev);
 	return ret;