diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-10 20:15:21 +0000 |
commit | eaddf6fd959074f6a6e71deffe079c71eef35da6 (patch) | |
tree | 720e7c7093d7c08ed56045b4fcb71bb3371c8094 /sound/soc/codecs/wm8904.c | |
parent | 24cc883c1fd16df34211ae41624aa6d3cd906693 (diff) | |
download | linux-stable-eaddf6fd959074f6a6e71deffe079c71eef35da6.tar.gz linux-stable-eaddf6fd959074f6a6e71deffe079c71eef35da6.tar.bz2 linux-stable-eaddf6fd959074f6a6e71deffe079c71eef35da6.zip |
ASoC: wm8904: Fix wrong value references for boolean kctl
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>
Cc: <stable@vger.kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
-rw-r--r-- | sound/soc/codecs/wm8904.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index d3b3f57668cc..215e93c1ddf0 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -525,7 +525,7 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = wm8904->deemph; + ucontrol->value.integer.value[0] = wm8904->deemph; return 0; } @@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8904_priv *wm8904 = 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; |