Commit 121963ed authored by Takashi Iwai's avatar Takashi Iwai Committed by Ben Hutchings

ASoC: wm2000: Fix wrong value references for boolean kctl

commit 00a14c29 upstream.

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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 09b01867
......@@ -614,7 +614,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,
{
struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev);
ucontrol->value.enumerated.item[0] = wm2000->anc_active;
ucontrol->value.integer.value[0] = wm2000->anc_active;
return 0;
}
......@@ -623,7 +623,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev);
int anc_active = ucontrol->value.enumerated.item[0];
int anc_active = ucontrol->value.integer.value[0];
if (anc_active > 1)
return -EINVAL;
......@@ -638,7 +638,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,
{
struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev);
ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
ucontrol->value.integer.value[0] = wm2000->spk_ena;
return 0;
}
......@@ -647,7 +647,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct wm2000_priv *wm2000 = dev_get_drvdata(&wm2000_i2c->dev);
int val = ucontrol->value.enumerated.item[0];
int val = ucontrol->value.integer.value[0];
if (val > 1)
return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment