From 7324759114cc1b549052c56e10e931c9f28bd30e Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Wed, 20 Oct 2010 04:21:51 +0000 Subject: [PATCH] --- yaml --- r: 215375 b: refs/heads/master c: e0e8ab596012d8c2147beb3c8b70d2d6ab90acda h: refs/heads/master i: 215373: dcb66d927f142b3767954e318bcc45107d92d6cd 215371: 6b781899160f86ce71661cb545f794936feaaf1a 215367: 1d97975c236c1df69cd166ff120b9af1584e542d 215359: 952b1da1b7ddb022276353f5b0b5913fc0c20251 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibmveth.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a191d8123bb8..d9000fc5fcab 100644 --- 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 index 2ae8336478b3..c454b45ca7ec 100644 --- a/trunk/drivers/net/ibmveth.c +++ b/trunk/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);