3.1 patches

added patches:
	b43-refuse-to-load-unsupported-firmware.patch
	mfd-fix-twl4030-dependencies-for-audio-codec.patch

diff --git a/queue-3.1/b43-refuse-to-load-unsupported-firmware.patch b/queue-3.1/b43-refuse-to-load-unsupported-firmware.patch
new file mode 100644 (file)
index 0000000..032b649
--- /dev/null
+++ b/queue-3.1/b43-refuse-to-load-unsupported-firmware.patch
@@ -0,0 +1,36 @@
+From zajec5@gmail.com  Wed Nov 16 15:21:46 2011
+From: Rafał Miłecki <zajec5@gmail.com>
+Date: Tue,  8 Nov 2011 17:15:03 +0100
+Subject: b43: refuse to load unsupported firmware
+To: stable@kernel.org, <Greg KH> greg@kroah.com
+Cc: linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org, roman-vl@meta.ua, Rafał Miłecki <zajec5@gmail.com>
+Message-ID: <1320768903-8731-1-git-send-email-zajec5@gmail.com>
+
+[This patch is supposed to be applied in 3.1 (and maybe older) branches only.]
+
+New kernels support newer firmware that users may try to incorrectly use
+with older kernels. Display error and explain the problem in such a case
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/wireless/b43/main.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -2508,6 +2508,13 @@ static int b43_upload_microcode(struct b
+               b43_print_fw_helptext(dev->wl, 1);
+               err = -EOPNOTSUPP;
+               goto error;
++      } else if (fwrev >= 598) {
++              b43err(dev->wl, "YOUR FIRMWARE IS TOO NEW. Support for "
++                     "firmware 598 and up requires kernel 3.2 or newer. You "
++                     "have to install older firmware or upgrade kernel.\n");
++              b43_print_fw_helptext(dev->wl, 1);
++              err = -EOPNOTSUPP;
++              goto error;
+       }
+       dev->fw.rev = fwrev;
+       dev->fw.patch = fwpatch;

diff --git a/queue-3.1/mfd-fix-twl4030-dependencies-for-audio-codec.patch b/queue-3.1/mfd-fix-twl4030-dependencies-for-audio-codec.patch
new file mode 100644 (file)
index 0000000..6c348c5
--- /dev/null
+++ b/queue-3.1/mfd-fix-twl4030-dependencies-for-audio-codec.patch
@@ -0,0 +1,44 @@
+From f09ee0451a44a4e913a7c3cec3805508f7de6c54 Mon Sep 17 00:00:00 2001
+From: Thomas Weber <weber@corscience.de>
+Date: Mon, 5 Sep 2011 11:26:33 +0200
+Subject: mfd: Fix twl4030 dependencies for audio codec
+
+From: Thomas Weber <weber@corscience.de>
+
+commit f09ee0451a44a4e913a7c3cec3805508f7de6c54 upstream.
+
+The codec for Devkit8000 (TWL4030)  was not detected except
+when build with CONFIG_SND_SOC_ALL_CODECS.
+
+twl-core.c still uses the CONFIG_TWL4030_CODEC for
+twl_has_codec().
+
+In commit 57fe7251f5bfc4332f24479376de48a1e8ca6211
+the CONFIG_TWL4030_CODEC was renamed
+into CONFIG_MFD_TWL4030_AUDIO, thatswhy the codec
+was not detected.
+
+This patch renames the CONFIG_ TWL4030_CODEC into
+CONFIG_MFD_TWL4030_AUDIO in twl-core.c.
+
+Signed-off-by: Thomas Weber <weber@corscience.de>
+Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
+Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
+Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/mfd/twl-core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mfd/twl-core.c
++++ b/drivers/mfd/twl-core.c
+@@ -109,7 +109,7 @@
+ #define twl_has_watchdog()        false
+ #endif
+ 
+-#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
++#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
+       defined(CONFIG_TWL6040_CORE) || defined(CONFIG_TWL6040_CORE_MODULE)
+ #define twl_has_codec()       true
+ #else

diff --git a/queue-3.1/series b/queue-3.1/series
index dec23deaa57aa76cbd1ea1855b286f595f193560..4979b8169234c4977272b13a17f5a6a0ac78c387 100644 (file)
--- a/queue-3.1/series
+++ b/queue-3.1/series
@@ -15,3 +15,5 @@ revert-leds-save-the-delay-values-after-a-successful-call-to-blink_set.patch
 drm-radeon-add-some-missing-firemv-pci-ids.patch
 drm-radeon-kms-fix-up-gpio-i2c-mask-bits-for-r4xx.patch
 staging-brcm80211-fill-in-proper-rx-rate-in-mac80211-rx-status.patch
+b43-refuse-to-load-unsupported-firmware.patch
+mfd-fix-twl4030-dependencies-for-audio-codec.patch