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

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 23:21:41 2010
New Revision: 16727

Log:
wireless: b43: fix error path in SDIO

add 2.6.35 longterm fix

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/wireless-b43-fix-error-path-in-sdio.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 20 23:08:15 2010	(r16726)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 23:21:41 2010	(r16727)
@@ -26,6 +26,7 @@
   * drm/radeon/kms: add workaround for dce3 ddc line vbios bug.
   * drm/radeon/kms: fix interlaced and doublescan handling.
   * drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable.
+  * wireless: b43: fix error path in SDIO.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/wireless-b43-fix-error-path-in-sdio.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/wireless-b43-fix-error-path-in-sdio.patch	Mon Dec 20 23:21:41 2010	(r16727)
@@ -0,0 +1,33 @@
+From e476a5a41ad67d0e2b4a652820c49a3923eb936b Mon Sep 17 00:00:00 2001
+From: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
+Date: Tue, 23 Nov 2010 17:10:24 +0100
+Subject: wireless: b43: fix error path in SDIO
+
+From: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
+
+commit e476a5a41ad67d0e2b4a652820c49a3923eb936b upstream.
+
+Fix unbalanced call to sdio_release_host() on the error path.
+
+Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
+Acked-by: Larry Finger <Larry.Finger at lwfinger.net>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+---
+ drivers/net/wireless/b43/sdio.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linux/drivers/net/wireless/b43/sdio.c
+===================================================================
+--- linux.orig/drivers/net/wireless/b43/sdio.c
++++ linux/drivers/net/wireless/b43/sdio.c
+@@ -163,6 +163,7 @@ static int b43_sdio_probe(struct sdio_fu
+ err_free_ssb:
+ 	kfree(sdio);
+ err_disable_func:
++	sdio_claim_host(func);
+ 	sdio_disable_func(func);
+ err_release_host:
+ 	sdio_release_host(func);

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 23:08:15 2010	(r16726)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 23:21:41 2010	(r16727)
@@ -14,3 +14,4 @@
 + bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
 + bugfix/all/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
 + bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
++ bugfix/all/wireless-b43-fix-error-path-in-sdio.patch