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

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 09:33:57 2010
New Revision: 16715

Log:
add b43 unload fix

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/b43-fix-warning-at-drivers-mmc-core-core.c-237-in-mmc_wait_for_cmd.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 09:33:49 2010	(r16714)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 09:33:57 2010	(r16715)
@@ -16,6 +16,7 @@
   [ maximilian attems ]
   * [openvz] Reenable NF_CONNTRACK_IPV6.
   * cifs: fix another memleak, in cifs_root_iget.
+  * b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd.
 
  -- 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/b43-fix-warning-at-drivers-mmc-core-core.c-237-in-mmc_wait_for_cmd.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/b43-fix-warning-at-drivers-mmc-core-core.c-237-in-mmc_wait_for_cmd.patch	Mon Dec 20 09:33:57 2010	(r16715)
@@ -0,0 +1,71 @@
+From 9f2a0fac625bcef9c579bcf0b0c904ab1a56e7c4 Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger at lwfinger.net>
+Date: Thu, 28 Oct 2010 10:43:26 -0500
+Subject: b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd
+
+From: Larry Finger <Larry.Finger at lwfinger.net>
+
+commit 9f2a0fac625bcef9c579bcf0b0c904ab1a56e7c4 upstream.
+
+On module removal, the sdio version of b43 generates the following warning:
+
+[  851.560519] ------------[ cut here ]------------
+[  851.560531] WARNING: at drivers/mmc/core/core.c:237 mmc_wait_for_cmd+0x88/0x90()
+[  851.560534] Hardware name: 20552PG
+[  851.560536] Modules linked in: b43(-) ssb mmc_block binfmt_misc rfcomm sco bnep ppdev l2cap ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_state nf_conntrack ipt_REJECT xt_tcpudp iptable_filter ip_tables x_tables bridge stp kvm_intel kvm arc4 iwlagn snd_hda_codec_conexant snd_hda_intel snd_hda_codec iwlcore snd_hwdep snd_pcm thinkpad_acpi mac80211 snd_seq_midi snd_rawmidi snd_seq_midi_event snd_seq r852 joydev snd_timer sm_common pcmcia nand snd_seq_device cfg80211 sdhci_pci btusb psmouse tpm_tis yenta_socket nand_ids lp snd pcmcia_rsrc nand_ecc bluetooth sdhci tpm pcmcia_core parport mtd snd_page_alloc serio_raw tpm_bios soundcore nvram led_class sha256_generic aes_i586 aes_generic dm_crypt i915 drm_kms_helper drm ahci intel_agp i2c_algo_bit intel_gtt e1000e libahci video agpgart output
+[  851.560620] Pid: 2504, comm: rmmod Not tainted 2.6.36-titan0+ #1
+[  851.560622] Call Trace:
+[  851.560631]  [<c014a102>] warn_slowpath_common+0x72/0xa0
+[  851.560636]  [<c04d94c8>] ? mmc_wait_for_cmd+0x88/0x90
+[  851.560641]  [<c04d94c8>] ? mmc_wait_for_cmd+0x88/0x90
+[  851.560645]  [<c014a152>] warn_slowpath_null+0x22/0x30
+[  851.560649]  [<c04d94c8>] mmc_wait_for_cmd+0x88/0x90
+[  851.560655]  [<c0401585>] ? device_release+0x25/0x80
+[  851.560660]  [<c04df210>] mmc_io_rw_direct_host+0xa0/0x150
+[  851.560665]  [<c04df370>] mmc_io_rw_direct+0x30/0x40
+[  851.560669]  [<c04e06e7>] sdio_disable_func+0x37/0xa0
+[  851.560683]  [<f8dfcb80>] b43_sdio_remove+0x30/0x50 [b43]
+[  851.560687]  [<c04df8cc>] sdio_bus_remove+0x1c/0x60
+[  851.560692]  [<c016d39f>] ? blocking_notifier_call_chain+0x1f/0x30
+[  851.560697]  [<c0404991>] __device_release_driver+0x51/0xb0
+[  851.560701]  [<c0404a7f>] driver_detach+0x8f/0xa0
+[  851.560705]  [<c0403c83>] bus_remove_driver+0x63/0xa0
+[  851.560709]  [<c0405039>] driver_unregister+0x49/0x80
+[  851.560713]  [<c0405039>] ? driver_unregister+0x49/0x80
+[  851.560718]  [<c04dfad7>] sdio_unregister_driver+0x17/0x20
+[  851.560727]  [<f8dfcb42>] b43_sdio_exit+0x12/0x20 [b43]
+[  851.560734]  [<f8dfe76f>] b43_exit+0x17/0x3c [b43]
+[  851.560740]  [<c017fb8d>] sys_delete_module+0x13d/0x200
+[  851.560747]  [<c01fd7d2>] ? do_munmap+0x212/0x300
+[  851.560752]  [<c010311f>] sysenter_do_call+0x12/0x28
+[  851.560757] ---[ end trace 31e14488072d2f7d ]---
+[  851.560759] ------------[ cut here ]------------
+
+The warning is caused by b43 not claiming the device before calling
+sdio_disable_func().
+
+Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+Reported-by: Arnd Hannemann <arnd at arndnet.de>
+Tested-by: Arnd Hannemann <arnd at arndnet.de>
+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 |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: linux/drivers/net/wireless/b43/sdio.c
+===================================================================
+--- linux.orig/drivers/net/wireless/b43/sdio.c
++++ linux/drivers/net/wireless/b43/sdio.c
+@@ -175,7 +175,9 @@ static void b43_sdio_remove(struct sdio_
+ 	struct b43_sdio *sdio = sdio_get_drvdata(func);
+ 
+ 	ssb_bus_unregister(&sdio->ssb);
++	sdio_claim_host(func);
+ 	sdio_disable_func(func);
++	sdio_release_host(func);
+ 	kfree(sdio);
+ 	sdio_set_drvdata(func, NULL);
+ }

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 09:33:49 2010	(r16714)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 09:33:57 2010	(r16715)
@@ -4,3 +4,4 @@
 + features/all/USB-Unusual-Device-support-for-Samsung-YP-CP3-MP4-Pl.patch
 + bugfix/all/tehuti-Firmware-filename-is-tehuti-bdx.bin.patch
 + bugfix/all/cifs-fix-another-memleak-in-cifs_root_iget.patch
++ bugfix/all/b43-fix-warning-at-drivers-mmc-core-core.c-237-in-mmc_wait_for_cmd.patch