From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Mar 2013 19:38:18 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.8.3~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=033ab89e606925f672bccce14069d4be579a85d2;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	alsa-ice1712-initialize-card-private_data-properly.patch
	alsa-vmaster-fix-slave-change-notification.patch
---

diff --git a/queue-3.4/alsa-ice1712-initialize-card-private_data-properly.patch b/queue-3.4/alsa-ice1712-initialize-card-private_data-properly.patch
new file mode 100644
index 00000000000..63f5dbf0c57
--- /dev/null
+++ b/queue-3.4/alsa-ice1712-initialize-card-private_data-properly.patch
@@ -0,0 +1,31 @@
+From 69a4cfdd444d1fe5c24d29b3a063964ac165d2cd Mon Sep 17 00:00:00 2001
+From: Sean Connor <sconnor004@allyinics.org>
+Date: Thu, 28 Feb 2013 09:20:00 -0500
+Subject: ALSA: ice1712: Initialize card->private_data properly
+
+From: Sean Connor <sconnor004@allyinics.org>
+
+commit 69a4cfdd444d1fe5c24d29b3a063964ac165d2cd upstream.
+
+Set card->private_data in snd_ice1712_create for fixing NULL
+dereference in snd_ice1712_remove().
+
+Signed-off-by: Sean Connor <sconnor004@allyinics.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/ice1712/ice1712.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/ice1712/ice1712.c
++++ b/sound/pci/ice1712/ice1712.c
+@@ -2595,6 +2595,8 @@ static int __devinit snd_ice1712_create(
+ 	snd_ice1712_proc_init(ice);
+ 	synchronize_irq(pci->irq);
+ 
++	card->private_data = ice;
++
+ 	err = pci_request_regions(pci, "ICE1712");
+ 	if (err < 0) {
+ 		kfree(ice);
diff --git a/queue-3.4/alsa-vmaster-fix-slave-change-notification.patch b/queue-3.4/alsa-vmaster-fix-slave-change-notification.patch
new file mode 100644
index 00000000000..c07516619ec
--- /dev/null
+++ b/queue-3.4/alsa-vmaster-fix-slave-change-notification.patch
@@ -0,0 +1,40 @@
+From 2069d483b39a603a5f3428a19d3b4ac89aa97f48 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 5 Mar 2013 15:43:39 +0100
+Subject: ALSA: vmaster: Fix slave change notification
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 2069d483b39a603a5f3428a19d3b4ac89aa97f48 upstream.
+
+When a value of a vmaster slave control is changed, the ctl change
+notification is sometimes ignored.  This happens when the master
+control overrides, e.g. when the corresponding master control is
+muted.  The reason is that slave_put() returns the value of the actual
+slave put callback, and it doesn't reflect the virtual slave value
+change.
+
+This patch fixes the function just to return 1 whenever a slave value
+is changed.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/core/vmaster.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/sound/core/vmaster.c
++++ b/sound/core/vmaster.c
+@@ -213,7 +213,10 @@ static int slave_put(struct snd_kcontrol
+ 	}
+ 	if (!changed)
+ 		return 0;
+-	return slave_put_val(slave, ucontrol);
++	err = slave_put_val(slave, ucontrol);
++	if (err < 0)
++		return err;
++	return 1;
+ }
+ 
+ static int slave_tlv_cmd(struct snd_kcontrol *kcontrol,
diff --git a/queue-3.4/series b/queue-3.4/series
index ae7147eb690..76f6a797fa6 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -21,3 +21,5 @@ hwmon-pmbus-ltc2978-fix-peak-attribute-handling.patch
 hwmon-pmbus-ltc2978-use-detected-chip-id-to-select.patch
 drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch
 arm-7663-1-perf-fix-armv7-evtype_mask-to-include-nsh-bit.patch
+alsa-ice1712-initialize-card-private_data-properly.patch
+alsa-vmaster-fix-slave-change-notification.patch