This is a note to let you know that I've just added the patch titled
ASoC: wm2000: Fix wrong value references for boolean kctl
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 00a14c2968e3d55817e0fa35c78106ca840537bf Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 10 Mar 2015 12:39:09 +0100
Subject: ASoC: wm2000: Fix wrong value references for boolean kctl
From: Takashi Iwai <tiwai@xxxxxxx>
commit 00a14c2968e3d55817e0fa35c78106ca840537bf upstream.
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Acked-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/wm2000.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -610,7 +610,7 @@ static int wm2000_anc_mode_get(struct sn
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- ucontrol->value.enumerated.item[0] = wm2000->anc_active;
+ ucontrol->value.integer.value[0] = wm2000->anc_active;
return 0;
}
@@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct sn
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- int anc_active = ucontrol->value.enumerated.item[0];
+ int anc_active = ucontrol->value.integer.value[0];
int ret;
if (anc_active > 1)
@@ -643,7 +643,7 @@ static int wm2000_speaker_get(struct snd
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
+ ucontrol->value.integer.value[0] = wm2000->spk_ena;
return 0;
}
@@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- int val = ucontrol->value.enumerated.item[0];
+ int val = ucontrol->value.integer.value[0];
int ret;
if (val > 1)
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.14/asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-pcm1681-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-cs4271-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.14/asoc-wm8903-fix-wrong-value-references-for-boolean-kctl.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html