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

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

ASoC: wm8904: 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 avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org>
parent 24cc883c

sound/soc/codecs/wm8904.c

+2 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.enumerated.item[0] = wm8904->deemph;

	ucontrol->value.integer.value[0] = wm8904->deemph;

	return 0;

}
@@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm8904_priv *wm8904 = 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;