diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:03 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-09 18:42:24 -0400 |
| commit | 83ebc44473b46a8921b770a2c4697b572d592c1c (patch) | |
| tree | fe2004f6cf02599c9c01349f76083b30e8515c2c /sound/soc/codecs/adav80x.c | |
| parent | 12708c851a6d458ce3c5a8a74231ca6b14762cbe (diff) | |
| download | linux-stable-83ebc44473b46a8921b770a2c4697b572d592c1c.tar.gz linux-stable-83ebc44473b46a8921b770a2c4697b572d592c1c.tar.bz2 linux-stable-83ebc44473b46a8921b770a2c4697b572d592c1c.zip | |
ASoC: adav80x: Fix wrong value references for boolean kctl
[ Upstream commit 2bf4c1d483d911cda5dd385527194d23e5cea73d ]
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'sound/soc/codecs/adav80x.c')
| -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 ce3cdca9fc62..01ab70a7f59f 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -317,7 +317,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(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; @@ -333,7 +333,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_soc_kcontrol_codec(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; }; |