diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 12:39:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-10 20:12:57 +0000 |
| commit | 2bf4c1d483d911cda5dd385527194d23e5cea73d (patch) | |
| tree | 9385d8aa39808411147681ac03c90af82bce4ca2 /sound | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-2bf4c1d483d911cda5dd385527194d23e5cea73d.tar.gz linux-2bf4c1d483d911cda5dd385527194d23e5cea73d.tar.bz2 linux-2bf4c1d483d911cda5dd385527194d23e5cea73d.zip | |
ASoC: adav80x: 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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org>
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 b67480f1b1aa..4373ada95648 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; }; |