diff options
| author | Petri Gynther <pgynther@google.com> | 2015-03-30 00:29:13 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:52:29 +0000 |
| commit | 95b5d4fc550be066548b02bdcbcdf0538d63d605 (patch) | |
| tree | cad9109c61b2b15ea34a9b7219ce48d111922b57 | |
| parent | 52f0b4f11aab0854fc31b83296d816d3d78c0892 (diff) | |
net: bcmgenet: fix bcmgenet_open()
commit fac25940c5e0d6f31d56bb2a704fadad6d5e382a upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index eb99d65f87f3..ebf18200d76d 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2058,7 +2058,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 */ |