aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-10 12:39:04 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:28 +0100
commitac10dda9a0684fea20b9ab75df58f9d383738d10 (patch)
tree2846f5f76e902b77a5ee221614db24fbd3ef2227 /sound
parent91afee8fa07e92b562661f8ab3189fbdad8dc24b (diff)
downloadkernel_samsung_smdk4412-ac10dda9a0684fea20b9ab75df58f9d383738d10.zip
kernel_samsung_smdk4412-ac10dda9a0684fea20b9ab75df58f9d383738d10.tar.gz
kernel_samsung_smdk4412-ac10dda9a0684fea20b9ab75df58f9d383738d10.tar.bz2
ASoC: ak4641: Fix wrong value references for boolean kctl
commit 08641d9b7bf915144a57a736b42642e13eb1167f 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> 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/ak4641.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 7783858..60891f6 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -75,7 +75,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct ak4641_priv *ak4641 = 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;
@@ -91,7 +91,7 @@ static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
- ucontrol->value.enumerated.item[0] = ak4641->deemph;
+ ucontrol->value.integer.value[0] = ak4641->deemph;
return 0;
};