iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

via-rhine: gotoize rhine_open error path.

Browse Source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
françois romieu 2015-05-01 22:14:40 +02:00 committed by David S. Miller
parent a21bb8bae1
commit 4d1fd9c1d8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/via/via-rhine.c
View File

@ -1688,15 +1688,14 @@ static int rhine_open(struct net_device *dev)
rc = request_irq(rp->irq, rhine_interrupt, IRQF_SHARED, dev->name, dev);
if (rc)
return rc;
goto out;
netif_dbg(rp, ifup, dev, "%s() irq %d\n", __func__, rp->irq);
rc = alloc_ring(dev);
if (rc) {
free_irq(rp->irq, dev);
return rc;
}
if (rc < 0)
goto out_free_irq;
alloc_rbufs(dev);
alloc_tbufs(dev);
rhine_chip_reset(dev);
@ -1709,7 +1708,12 @@ static int rhine_open(struct net_device *dev)
netif_start_queue(dev);
return 0;
out:
return rc;
out_free_irq:
free_irq(rp->irq, dev);
goto out;
}
static void rhine_reset_task(struct work_struct *work)