LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH net-next] net: ethernet: ti: cpsw: correct .ndo_open error path
@ 2019-05-28 12:33 Ivan Khoronzhuk
  2019-05-28 17:48 ` Ivan Khoronzhuk
  0 siblings, 1 reply; 2+ messages in thread
From: Ivan Khoronzhuk @ 2019-05-28 12:33 UTC (permalink / raw)
  To: grygorii.strashko
  Cc: davem, linux-omap, netdev, linux-kernel, Ivan Khoronzhuk

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.
Also correct label name for shared error path.

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

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 634fc484a0b3..473d25ed59e3 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1399,7 +1399,7 @@ static int cpsw_ndo_open(struct net_device *ndev)
 
 		ret = cpsw_fill_rx_channels(priv);
 		if (ret < 0)
-			goto err_cleanup;
+			goto err_shared_cleanup;
 
 		if (cpts_register(cpsw->cpts))
 			dev_err(priv->dev, "error registering cpts device\n");
@@ -1422,9 +1422,10 @@ static int cpsw_ndo_open(struct net_device *ndev)
 
 	return 0;
 
-err_cleanup:
+err_shared_cleanup:
 	cpdma_ctlr_stop(cpsw->dma);
 	for_each_slave(priv, cpsw_slave_stop, cpsw);
+err_cleanup:
 	pm_runtime_put_sync(cpsw->dev);
 	netif_carrier_off(priv->ndev);
 	return ret;
-- 
2.17.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net: ethernet: ti: cpsw: correct .ndo_open error path
  2019-05-28 12:33 [PATCH net-next] net: ethernet: ti: cpsw: correct .ndo_open error path Ivan Khoronzhuk
@ 2019-05-28 17:48 ` Ivan Khoronzhuk
  0 siblings, 0 replies; 2+ messages in thread
From: Ivan Khoronzhuk @ 2019-05-28 17:48 UTC (permalink / raw)
  To: grygorii.strashko; +Cc: davem, linux-omap, netdev, linux-kernel

Please ignore this version, I've sent version 2 that do the same but is more
adjustable for later on changes and based on usage counter.

-- 
Regards,
Ivan Khoronzhuk

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-28 17:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-28 12:33 [PATCH net-next] net: ethernet: ti: cpsw: correct .ndo_open error path Ivan Khoronzhuk
2019-05-28 17:48 ` Ivan Khoronzhuk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).