diff options
| author |   Petri Gynther <pgynther@google.com> | 2015-03-30 00:29:13 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-31 14:15:01 -0400 |
| commit | fac25940c5e0d6f31d56bb2a704fadad6d5e382a (patch) | |
| tree | 6c8b260503febba0f89c8bc1d4bbfd5524b1232c /drivers/net/ethernet/broadcom | |
| parent | net: bcmgenet: remove __bcmgenet_fini_dma() (diff) | |
| download | linux-dev-fac25940c5e0d6f31d56bb2a704fadad6d5e382a.tar.xz linux-dev-fac25940c5e0d6f31d56bb2a704fadad6d5e382a.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -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 546d8623d8eb..5238b33f7b8d 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -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 */ |