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

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

ASoC: wm2000: 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 4c523ef6

sound/soc/codecs/wm2000.c

+4 −4
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);



	ucontrol->value.enumerated.item[0] = wm2000->anc_active;

	ucontrol->value.integer.value[0] = wm2000->anc_active;



	return 0;

}
@@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

	int anc_active = ucontrol->value.enumerated.item[0];

	int anc_active = ucontrol->value.integer.value[0];

	int ret;



	if (anc_active > 1)
@@ -643,7 +643,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);



	ucontrol->value.enumerated.item[0] = wm2000->spk_ena;

	ucontrol->value.integer.value[0] = wm2000->spk_ena;



	return 0;

}
@@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);

	int val = ucontrol->value.enumerated.item[0];

	int val = ucontrol->value.integer.value[0];

	int ret;



	if (val > 1)