|
@@ -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)
|