提交 4d1fd9c1 编写于 作者: F françois romieu 提交者: David S. Miller

via-rhine: gotoize rhine_open error path.

Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 a21bb8ba
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册