Commit f4d438ee authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown

ASoC: omap: rx51: Fix enum ctl accesses in a wrong type

"Speaker Function", "Input Select" and "Jack Function" ctls in rx51
driver 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>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dd90533c
...@@ -132,7 +132,7 @@ static struct snd_soc_ops rx51_ops = { ...@@ -132,7 +132,7 @@ static struct snd_soc_ops rx51_ops = {
static int rx51_get_spk(struct snd_kcontrol *kcontrol, static int rx51_get_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = rx51_spk_func; ucontrol->value.enumerated.item[0] = rx51_spk_func;
return 0; return 0;
} }
...@@ -142,10 +142,10 @@ static int rx51_set_spk(struct snd_kcontrol *kcontrol, ...@@ -142,10 +142,10 @@ static int rx51_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 (rx51_spk_func == ucontrol->value.integer.value[0]) if (rx51_spk_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
rx51_spk_func = ucontrol->value.integer.value[0]; rx51_spk_func = ucontrol->value.enumerated.item[0];
rx51_ext_control(&card->dapm); rx51_ext_control(&card->dapm);
return 1; return 1;
...@@ -180,7 +180,7 @@ static int rx51_hp_event(struct snd_soc_dapm_widget *w, ...@@ -180,7 +180,7 @@ static int rx51_hp_event(struct snd_soc_dapm_widget *w,
static int rx51_get_input(struct snd_kcontrol *kcontrol, static int rx51_get_input(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = rx51_dmic_func; ucontrol->value.enumerated.item[0] = rx51_dmic_func;
return 0; return 0;
} }
...@@ -190,10 +190,10 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol, ...@@ -190,10 +190,10 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol,
{ {
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
if (rx51_dmic_func == ucontrol->value.integer.value[0]) if (rx51_dmic_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
rx51_dmic_func = ucontrol->value.integer.value[0]; rx51_dmic_func = ucontrol->value.enumerated.item[0];
rx51_ext_control(&card->dapm); rx51_ext_control(&card->dapm);
return 1; return 1;
...@@ -202,7 +202,7 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol, ...@@ -202,7 +202,7 @@ static int rx51_set_input(struct snd_kcontrol *kcontrol,
static int rx51_get_jack(struct snd_kcontrol *kcontrol, static int rx51_get_jack(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.integer.value[0] = rx51_jack_func; ucontrol->value.enumerated.item[0] = rx51_jack_func;
return 0; return 0;
} }
...@@ -212,10 +212,10 @@ static int rx51_set_jack(struct snd_kcontrol *kcontrol, ...@@ -212,10 +212,10 @@ static int rx51_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 (rx51_jack_func == ucontrol->value.integer.value[0]) if (rx51_jack_func == ucontrol->value.enumerated.item[0])
return 0; return 0;
rx51_jack_func = ucontrol->value.integer.value[0]; rx51_jack_func = ucontrol->value.enumerated.item[0];
rx51_ext_control(&card->dapm); rx51_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