p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

"Jack Function" and "Speaker Function" ctls in tosa are enum, while
the current driver accesses wrongly via value.integer.value[].  They
have to be via value.enumerated.item[] instead.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Takashi Iwai 2016-02-29 17:23:53 +01:00 committed by Mark Brown
parent 49a1ba16ab
commit 419396d5a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/pxa/tosa.c
View File

@ -95,7 +95,7 @@ static struct snd_soc_ops tosa_ops = {
static int tosa_get_jack(struct snd_kcontrol *kcontrol, static int tosa_get_jack(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = tosa_jack_func; ucontrol->value.enumerated.item[0] = tosa_jack_func;
return 0; return 0;
} }
@ -104,10 +104,10 @@ static int tosa_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 (tosa_jack_func == ucontrol->value.integer.value[0]) if (tosa_jack_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
tosa_jack_func = ucontrol->value.integer.value[0]; tosa_jack_func = ucontrol->value.enumerated.item[0];
tosa_ext_control(&card->dapm); tosa_ext_control(&card->dapm);
return 1; return 1;
} }
@ -115,7 +115,7 @@ static int tosa_set_jack(struct snd_kcontrol *kcontrol,
static int tosa_get_spk(struct snd_kcontrol *kcontrol, static int tosa_get_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = tosa_spk_func; ucontrol->value.enumerated.item[0] = tosa_spk_func;
return 0; return 0;
} }
@ -124,10 +124,10 @@ static int tosa_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 (tosa_spk_func == ucontrol->value.integer.value[0]) if (tosa_spk_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
tosa_spk_func = ucontrol->value.integer.value[0]; tosa_spk_func = ucontrol->value.enumerated.item[0];
tosa_ext_control(&card->dapm); tosa_ext_control(&card->dapm);
return 1; return 1;
} }