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.khoronz...@linaro.org>
---
 drivers/net/ethernet/ti/cpsw.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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;
-- 
2.17.1

Reply via email to