diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:14 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:29 +0100 |
| commit | 48e1bc01b1b8f173586ae46f3e94de8d4aca89d9 (patch) | |
| tree | 7df442557a9b93e74492afbf6c89b23faf6d5aae /sound | |
| parent | 5d20d72621bdcf6ca90e5ec844a2386955f10020 (diff) | |
| download | kernel_samsung_smdk4412-48e1bc01b1b8f173586ae46f3e94de8d4aca89d9.zip kernel_samsung_smdk4412-48e1bc01b1b8f173586ae46f3e94de8d4aca89d9.tar.gz kernel_samsung_smdk4412-48e1bc01b1b8f173586ae46f3e94de8d4aca89d9.tar.bz2 | |
ASoC: wm8960: Fix wrong value references for boolean kctl
commit b4a18c8b1af15ebfa9054a3d2aef7b0a7e6f2a05 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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 3551705..b2abe93 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -135,7 +135,7 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = wm8960->deemph; + ucontrol->value.integer.value[0] = wm8960->deemph; return 0; } @@ -144,7 +144,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8960_priv *wm8960 = 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; |