Patchwork [3/3] drivers/net/82596.c: fix warning

login
register
mail settings
Submitter Andrew Morton
Date July 20, 2010, 10:25 p.m.
Message ID <201007202225.o6KMPIQd021449@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/59378/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Andrew Morton - July 20, 2010, 10:25 p.m.
From: Andrew Morton <akpm@linux-foundation.org>

drivers/net/82596.c: In function 'i596_open':
drivers/net/82596.c:1044: warning: label 'err_irq_dev' defined but not used

Caused by "82596: free resources on error"

Cc: Kulikov Vasiliy <segooon@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/82596.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Miller - July 21, 2010, 6:18 p.m.
From: akpm@linux-foundation.org
Date: Tue, 20 Jul 2010 15:25:18 -0700

> From: Andrew Morton <akpm@linux-foundation.org>
> 
> drivers/net/82596.c: In function 'i596_open':
> drivers/net/82596.c:1044: warning: label 'err_irq_dev' defined but not used
> 
> Caused by "82596: free resources on error"
> 
> Cc: Kulikov Vasiliy <segooon@gmail.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

When this hit the -mm tree, I replied to the -mm postinging that I applied
it to net-next-2.6

So it's integrated already :-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -puN drivers/net/82596.c~drivers-net-82596c-fix-warning drivers/net/82596.c
--- a/drivers/net/82596.c~drivers-net-82596c-fix-warning
+++ a/drivers/net/82596.c
@@ -1040,8 +1040,8 @@  err_queue:
 err_irq_56:
 #ifdef ENABLE_MVME16x_NET
 	free_irq(0x56, dev);
-#endif
 err_irq_dev:
+#endif
 	free_irq(dev->irq, dev);
 
 	return res;