Commit 49a1ba16 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown

ASoC: pxa: spitz: Fix enum ctl accesses in a wrong type

"Jack Function" and "Speaker Function" ctls in spitz are enum, while
the current driver accesses wrongly via value.integer.value[].  They
have to be via value.enumerated.item[] instead.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7a3f4b48
...@@ -164,7 +164,7 @@ static struct snd_soc_ops spitz_ops = { ...@@ -164,7 +164,7 @@ static struct snd_soc_ops spitz_ops = {
static int spitz_get_jack(struct snd_kcontrol *kcontrol, static int spitz_get_jack(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = spitz_jack_func; ucontrol->value.enumerated.item[0] = spitz_jack_func;
return 0; return 0;
} }
...@@ -173,10 +173,10 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol, ...@@ -173,10 +173,10 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
if (spitz_jack_func == ucontrol->value.integer.value[0]) if (spitz_jack_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
spitz_jack_func = ucontrol->value.integer.value[0]; spitz_jack_func = ucontrol->value.enumerated.item[0];
spitz_ext_control(&card->dapm); spitz_ext_control(&card->dapm);
return 1; return 1;
} }
...@@ -184,7 +184,7 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol, ...@@ -184,7 +184,7 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol,
static int spitz_get_spk(struct snd_kcontrol *kcontrol, static int spitz_get_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = spitz_spk_func; ucontrol->value.enumerated.item[0] = spitz_spk_func;
return 0; return 0;
} }
...@@ -193,10 +193,10 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, ...@@ -193,10 +193,10 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
if (spitz_spk_func == ucontrol->value.integer.value[0]) if (spitz_spk_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
spitz_spk_func = ucontrol->value.integer.value[0]; spitz_spk_func = ucontrol->value.enumerated.item[0];
spitz_ext_control(&card->dapm); spitz_ext_control(&card->dapm);
return 1; return 1;
} }
......
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