---

yaml --- r: 215375 b: refs/heads/master c: e0e8ab5 h: refs/heads/master i: 215373: dcb66d9 215371: 6b78189 215367: 1d97975 215359: 952b1da v: v3
git-mirror · Oct 21, 2010 · 7324759 · 7324759
1 parent db2906c
commit 7324759
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88426f2acae0cf887446013db9eab776871610e7
+refs/heads/master: e0e8ab596012d8c2147beb3c8b70d2d6ab90acda
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
@@ -641,15 +641,15 @@ 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,
 			   netdev->mtu + IBMVETH_BUFF_OH, DMA_BIDIRECTIONAL);
 	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);