Commit fac25940 authored Mar 30, 2015 by Petri Gynther Committed by David S. Miller Mar 31, 2015

net: bcmgenet: fix bcmgenet_open()



If bcmgenet_init_dma() fails, it cleans up after itself. Rx and Tx
DMAs are off, and NAPI instances haven't been netif_napi_add()'ed.
Therefore, we need to skip calling bcmgenet_fini_dma() on the error
handling path. bcmgenet_resume() already does this correctly.

Signed-off-by: Petri Gynther <pgynther@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9abab96d

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2666,7 +2666,7 @@ static int bcmgenet_open(struct net_device *dev)
		ret = bcmgenet_init_dma(priv);
		if (ret) {
		netdev_err(dev, "failed to initialize DMA\n");
		goto err_fini_dma;
		goto err_clk_disable;
		}

		/* Always enable ring 16 - descriptor ring */