Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bf4c1d4 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org>
parent c517d838

sound/soc/codecs/adav80x.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

};