diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:13 +0100 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 11:40:27 +0800 |
| commit | 681b80cfefe4bdf81418bef0d232f6fef7125e25 (patch) | |
| tree | a285b87c465a5fb647f5949be983d6b89f422299 /sound | |
| parent | e23ae32c0b757940ea7c8b5c83052b2ebec4c22a (diff) | |
| download | lwn-681b80cfefe4bdf81418bef0d232f6fef7125e25.tar.gz lwn-681b80cfefe4bdf81418bef0d232f6fef7125e25.zip | |
ASoC: wm8955: Fix wrong value references for boolean kctl
commit 07892b10356f17717abdc578acbef72db86c880e 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@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8955.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 61fe97433e73..4696f6668259 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -393,7 +393,7 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = wm8955->deemph; + ucontrol->value.integer.value[0] = wm8955->deemph; return 0; } @@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.enumerated.item[0]; + int deemph = ucontrol->value.integer.value[0]; if (deemph > 1) return -EINVAL; |