Commit faa62087 authored Jun 18, 2020 by Claudiu Beznea Committed by David S. Miller Jun 19, 2020

net: macb: undo operations in case of failure



Undo previously done operation in case macb_phylink_connect()
fails. Since macb_reset_hw() is the 1st undo operation the
napi_exit label was renamed to reset_hw.

Fixes: 7897b071 ("net: macb: convert to phylink")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2996cbd5

drivers/net/ethernet/cadence/macb_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2558,7 +2558,7 @@ static int macb_open(struct net_device *dev)

		err = macb_phylink_connect(bp);
		if (err)
		goto napi_exit;
		goto reset_hw;

		netif_tx_start_all_queues(dev);

		@@ -2567,9 +2567,11 @@ static int macb_open(struct net_device *dev)

		return 0;

		napi_exit:
		reset_hw:
		macb_reset_hw(bp);
		for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
		napi_disable(&queue->napi);
		macb_free_consistent(bp);
		pm_exit:
		pm_runtime_put_sync(&bp->pdev->dev);
		return err;

Admin message