From e0e8ab596012d8c2147beb3c8b70d2d6ab90acda Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Wed, 20 Oct 2010 04:21:51 +0000 Subject: ibmveth: Free irq on error path Free irq on error path. Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller --- drivers/net/ibmveth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 2ae8336478b3..c454b45ca7ec 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c @@ -641,7 +641,7 @@ static int ibmveth_open(struct net_device *netdev) if (!adapter->bounce_buffer) { netdev_err(netdev, "unable to allocate bounce buffer\n"); rc = -ENOMEM; - goto err_out; + goto err_out_free_irq; } adapter->bounce_buffer_dma = dma_map_single(&adapter->vdev->dev, adapter->bounce_buffer, @@ -649,7 +649,7 @@ static int ibmveth_open(struct net_device *netdev) if (dma_mapping_error(dev, adapter->bounce_buffer_dma)) { netdev_err(netdev, "unable to map bounce buffer\n"); rc = -ENOMEM; - goto err_out; + goto err_out_free_irq; } netdev_dbg(netdev, "initial replenish cycle\n"); @@ -661,6 +661,8 @@ static int ibmveth_open(struct net_device *netdev) return 0; +err_out_free_irq: + free_irq(netdev->irq, netdev); err_out: ibmveth_cleanup(adapter); napi_disable(&adapter->napi); -- cgit v1.2.3