diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:03 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 14:14:03 +0200 |
| commit | 0a62e30bd1dd5c75d38dce141f5cb785c7a08bda (patch) | |
| tree | 3aa86d508566094254b2666dec88c99e744160e1 /sound | |
| parent | 85f91218f6ac79c8ce1d449ab49f7fd97e0fd5cb (diff) | |
| download | lwn-0a62e30bd1dd5c75d38dce141f5cb785c7a08bda.tar.gz lwn-0a62e30bd1dd5c75d38dce141f5cb785c7a08bda.zip | |
ASoC: adav80x: Fix wrong value references for boolean kctl
commit 2bf4c1d483d911cda5dd385527194d23e5cea73d 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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/adav80x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index 15b012d0f226..3be52ff14362 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -307,7 +307,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec); - unsigned int deemph = ucontrol->value.enumerated.item[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; if (deemph > 1) return -EINVAL; @@ -323,7 +323,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec); - ucontrol->value.enumerated.item[0] = adav80x->deemph; + ucontrol->value.integer.value[0] = adav80x->deemph; return 0; }; |