diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:10 +0100 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 11:40:27 +0800 |
| commit | 41b86a1960a09af7e4808c13e57701e7b4720b5b (patch) | |
| tree | 7d32dbc907c8dd7fb2fcf5ba7a86d501ed7c4992 /sound | |
| parent | 4285caa07eb6429662af0ccdcc10c7df80b5872b (diff) | |
| download | lwn-41b86a1960a09af7e4808c13e57701e7b4720b5b.tar.gz lwn-41b86a1960a09af7e4808c13e57701e7b4720b5b.zip | |
ASoC: wm8731: Fix wrong value references for boolean kctl
commit bd14016fbf31aa199026f1e2358eab695f374eb1 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/wm8731.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 8b5afc1d2e60..3616b5b76837 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -120,7 +120,7 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = wm8731->deemph; + ucontrol->value.integer.value[0] = wm8731->deemph; return 0; } @@ -130,7 +130,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.enumerated.item[0]; + int deemph = ucontrol->value.integer.value[0]; int ret = 0; if (deemph > 1) |