From: Ivan Khoronzhuk Date: Tue, 28 May 2019 17:45:19 +0000 (+0300) Subject: net: ethernet: ti: cpsw: correct .ndo_open error path X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=02caceded0691a31a21b62011da8dae0d3aec85b;p=openwrt%2Fstaging%2Fblogic.git net: ethernet: ti: cpsw: correct .ndo_open error path 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 Signed-off-by: David S. Miller --- 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;