This is a note to let you know that I've just added the patch titled
ASoC: wm9712: Fix wrong value references for boolean kctl
to the 3.19-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-wm9712-fix-wrong-value-references-for-boolean-kctl.patch
and it can be found in the queue-3.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4b0b669b86a963f71feaa1a694e881832fdf4f86 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Tue, 10 Mar 2015 12:39:15 +0100
Subject: ASoC: wm9712: Fix wrong value references for boolean kctl
From: Takashi Iwai <tiwai@xxxxxxx>
commit 4b0b669b86a963f71feaa1a694e881832fdf4f86 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/wm9712.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -180,7 +180,7 @@ static int wm9712_hp_mixer_put(struct sn
struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
- unsigned int val = ucontrol->value.enumerated.item[0];
+ unsigned int val = ucontrol->value.integer.value[0];
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
unsigned int mixer, mask, shift, old;
@@ -193,7 +193,7 @@ static int wm9712_hp_mixer_put(struct sn
mutex_lock(&wm9712->lock);
old = wm9712->hp_mixer[mixer];
- if (ucontrol->value.enumerated.item[0])
+ if (ucontrol->value.integer.value[0])
wm9712->hp_mixer[mixer] |= mask;
else
wm9712->hp_mixer[mixer] &= ~mask;
@@ -231,7 +231,7 @@ static int wm9712_hp_mixer_get(struct sn
mixer = mc->shift >> 8;
shift = mc->shift & 0xff;
- ucontrol->value.enumerated.item[0] =
+ ucontrol->value.integer.value[0] =
(wm9712->hp_mixer[mixer] >> shift) & 1;
return 0;
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.19/asoc-es8238-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm9713-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-pcm1681-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm8960-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm9712-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-tas5086-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm2000-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-cs4271-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/asoc-wm8731-fix-wrong-value-references-for-boolean-kctl.patch
queue-3.19/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