Skip to contentSkip to conversation

ibmveth: Free irq on error path

PATCH Applied Denis Kirjanov 2 participants 2 messages Oct 20, 2010 – Oct 21, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Denis Kirjanov

author
#0 lore raw

PATCH 2/2 ibmveth: Free irq on error path

Free irq on error path.

Signed-off-by Denis Kirjanov <[email protected]>
---
 drivers/net/ibmveth.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/ibmveth.c +4 -2
index 2ae8336..c454b45 100644
@@ -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);
Signature · 1 line
1.7.2.2