[kernel] r18080 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 11 23:51:55 2011
New Revision: 18080

Log:
3c503: fix broken IRQ autoprobing (Closes: #566522)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/3c503-fix-broken-IRQ-autoprobing.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Sep 11 23:46:55 2011	(r18079)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Sep 11 23:51:55 2011	(r18080)
@@ -103,6 +103,7 @@
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.46
     and the bug report which this closes: #641232.
   * drm/ttm: fix ttm_bo_add_ttm(user) failure path
+  * 3c503: fix broken IRQ autoprobing (Closes: #566522)
 
  -- maximilian attems <maks at debian.org>  Sat, 25 Jun 2011 10:22:27 +0200
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/3c503-fix-broken-IRQ-autoprobing.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/3c503-fix-broken-IRQ-autoprobing.patch	Sun Sep 11 23:51:55 2011	(r18080)
@@ -0,0 +1,43 @@
+From: Ondrej Zary <linux at rainbow-software.org>
+Date: Sun, 12 Jun 2011 09:40:49 +0000
+Subject: [PATCH] 3c503: fix broken IRQ autoprobing
+
+commit 1ffde03d2aa112750468cff07efc9e0a504517dd upstream.
+
+Fix broken IRQ autoprobing in 3c503 driver:
+ - improper IRQ freeing (does not free IRQs causes WARN)
+ - missing break when an working IRQ is found
+
+The driver works with this patch.
+
+Signed-off-by: Ondrej Zary <linux at rainbow-software.org>
+Reviewed-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at conan.davemloft.net>
+---
+ drivers/net/3c503.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
+index d84f6e8..5b73298 100644
+--- a/drivers/net/3c503.c
++++ b/drivers/net/3c503.c
+@@ -412,7 +412,7 @@ el2_open(struct net_device *dev)
+ 		outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR);
+ 		outb_p(0x00, E33G_IDCFR);
+ 		msleep(1);
+-		free_irq(*irqp, el2_probe_interrupt);
++		free_irq(*irqp, &seen);
+ 		if (!seen)
+ 			continue;
+ 
+@@ -422,6 +422,7 @@ el2_open(struct net_device *dev)
+ 			continue;
+ 		if (retval < 0)
+ 			goto err_disable;
++		break;
+ 	} while (*++irqp);
+ 
+ 	if (*irqp == 0) {
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sun Sep 11 23:46:55 2011	(r18079)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sun Sep 11 23:51:55 2011	(r18080)
@@ -694,3 +694,4 @@
 
 + bugfix/all/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch
 + bugfix/all/igb-Fix-lack-of-flush-after-register-write-and-befor.patch
++ bugfix/all/3c503-fix-broken-IRQ-autoprobing.patch