From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 3 Oct 2013 02:47:31 +0000 (-0700)
Subject: 3.11-stable patches
X-Git-Tag: v3.0.99~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b184c7da4046e60d5946b47f16ca1e42a14530ef;p=thirdparty%2Fkernel%2Fstable-queue.git

3.11-stable patches

added patches:
	alsa-compress-fix-compress-device-unregister.patch
	hwmon-applesmc-check-key-count-before-proceeding.patch
---

diff --git a/queue-3.11/alsa-compress-fix-compress-device-unregister.patch b/queue-3.11/alsa-compress-fix-compress-device-unregister.patch
new file mode 100644
index 00000000000..f901d520202
--- /dev/null
+++ b/queue-3.11/alsa-compress-fix-compress-device-unregister.patch
@@ -0,0 +1,34 @@
+From 4028b6c4c03f213260e9290ff3a6b5439aad07ce Mon Sep 17 00:00:00 2001
+From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+Date: Fri, 13 Sep 2013 17:43:17 +0100
+Subject: ALSA: compress: Fix compress device unregister.
+
+From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+
+commit 4028b6c4c03f213260e9290ff3a6b5439aad07ce upstream.
+
+snd_unregister_device() should return the device type and not stream
+direction.
+
+Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+Acked-by: Vinod Koul <vinod.koul@intel.com>
+Tested-by: Vinod Koul <vinod.koul@intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/core/compress_offload.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/core/compress_offload.c
++++ b/sound/core/compress_offload.c
+@@ -837,7 +837,8 @@ static int snd_compress_dev_disconnect(s
+ 	struct snd_compr *compr;
+ 
+ 	compr = device->device_data;
+-	snd_unregister_device(compr->direction, compr->card, compr->device);
++	snd_unregister_device(SNDRV_DEVICE_TYPE_COMPRESS, compr->card,
++		compr->device);
+ 	return 0;
+ }
+ 
diff --git a/queue-3.11/hwmon-applesmc-check-key-count-before-proceeding.patch b/queue-3.11/hwmon-applesmc-check-key-count-before-proceeding.patch
new file mode 100644
index 00000000000..0d20dfa5fc9
--- /dev/null
+++ b/queue-3.11/hwmon-applesmc-check-key-count-before-proceeding.patch
@@ -0,0 +1,53 @@
+From 5f4513864304672e6ea9eac60583eeac32e679f2 Mon Sep 17 00:00:00 2001
+From: Henrik Rydberg <rydberg@euromail.se>
+Date: Thu, 26 Sep 2013 08:33:16 +0200
+Subject: hwmon: (applesmc) Check key count before proceeding
+
+From: Henrik Rydberg <rydberg@euromail.se>
+
+commit 5f4513864304672e6ea9eac60583eeac32e679f2 upstream.
+
+After reports from Chris and Josh Boyer of a rare crash in applesmc,
+Guenter pointed at the initialization problem fixed below. The patch
+has not been verified to fix the crash, but should be applied
+regardless.
+
+Reported-by: <jwboyer@fedoraproject.org>
+Suggested-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwmon/applesmc.c |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- a/drivers/hwmon/applesmc.c
++++ b/drivers/hwmon/applesmc.c
+@@ -525,16 +525,25 @@ static int applesmc_init_smcreg_try(void
+ {
+ 	struct applesmc_registers *s = &smcreg;
+ 	bool left_light_sensor, right_light_sensor;
++	unsigned int count;
+ 	u8 tmp[1];
+ 	int ret;
+ 
+ 	if (s->init_complete)
+ 		return 0;
+ 
+-	ret = read_register_count(&s->key_count);
++	ret = read_register_count(&count);
+ 	if (ret)
+ 		return ret;
+ 
++	if (s->cache && s->key_count != count) {
++		pr_warn("key count changed from %d to %d\n",
++			s->key_count, count);
++		kfree(s->cache);
++		s->cache = NULL;
++	}
++	s->key_count = count;
++
+ 	if (!s->cache)
+ 		s->cache = kcalloc(s->key_count, sizeof(*s->cache), GFP_KERNEL);
+ 	if (!s->cache)
diff --git a/queue-3.11/series b/queue-3.11/series
index f5db774142b..115fbf89737 100644
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@ -52,3 +52,5 @@ drm-radeon-don-t-set-default-clocks-for-si-when-dpm-is-disabled.patch
 drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch
 drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch
 drm-radeon-fix-hdmi-audio-on-dce3.0-3.1-asics.patch
+hwmon-applesmc-check-key-count-before-proceeding.patch
+alsa-compress-fix-compress-device-unregister.patch