* [PATCH -next 2/2] ibmveth: Free irq on error path
@ 2010-10-20 14:21 Denis Kirjanov
2010-10-21 8:34 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Denis Kirjanov @ 2010-10-20 14:21 UTC (permalink / raw)
To: davem; +Cc: rcj, netdev
Free irq on error path.
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---
drivers/net/ibmveth.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 2ae8336..c454b45 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);
--
1.7.2.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next 2/2] ibmveth: Free irq on error path
2010-10-20 14:21 [PATCH -next 2/2] ibmveth: Free irq on error path Denis Kirjanov
@ 2010-10-21 8:34 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-10-21 8:34 UTC (permalink / raw)
To: dkirjanov; +Cc: rcj, netdev
From: Denis Kirjanov <dkirjanov@kernel.org>
Date: Wed, 20 Oct 2010 14:21:51 +0000
> Free irq on error path.
>
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-21 8:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-20 14:21 [PATCH -next 2/2] ibmveth: Free irq on error path Denis Kirjanov
2010-10-21 8:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).