mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
ASoC: omap: n810: Fix enum ctl accesses in a wrong type
"Jack Function", "Speaker Function" and "Input Select" ctls in n810 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: Takashi Iwai <tiwai@suse.de> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
92e963f50f
commit
dd90533cd6
@ -133,7 +133,7 @@ static struct snd_soc_ops n810_ops = {
|
||||
static int n810_get_spk(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
ucontrol->value.integer.value[0] = n810_spk_func;
|
||||
ucontrol->value.enumerated.item[0] = n810_spk_func;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -143,10 +143,10 @@ static int n810_set_spk(struct snd_kcontrol *kcontrol,
|
||||
{
|
||||
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
|
||||
|
||||
if (n810_spk_func == ucontrol->value.integer.value[0])
|
||||
if (n810_spk_func == ucontrol->value.enumerated.item[0])
|
||||
return 0;
|
||||
|
||||
n810_spk_func = ucontrol->value.integer.value[0];
|
||||
n810_spk_func = ucontrol->value.enumerated.item[0];
|
||||
n810_ext_control(&card->dapm);
|
||||
|
||||
return 1;
|
||||
@ -155,7 +155,7 @@ static int n810_set_spk(struct snd_kcontrol *kcontrol,
|
||||
static int n810_get_jack(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
ucontrol->value.integer.value[0] = n810_jack_func;
|
||||
ucontrol->value.enumerated.item[0] = n810_jack_func;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -165,10 +165,10 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol,
|
||||
{
|
||||
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
|
||||
|
||||
if (n810_jack_func == ucontrol->value.integer.value[0])
|
||||
if (n810_jack_func == ucontrol->value.enumerated.item[0])
|
||||
return 0;
|
||||
|
||||
n810_jack_func = ucontrol->value.integer.value[0];
|
||||
n810_jack_func = ucontrol->value.enumerated.item[0];
|
||||
n810_ext_control(&card->dapm);
|
||||
|
||||
return 1;
|
||||
@ -177,7 +177,7 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol,
|
||||
static int n810_get_input(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
ucontrol->value.integer.value[0] = n810_dmic_func;
|
||||
ucontrol->value.enumerated.item[0] = n810_dmic_func;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -187,10 +187,10 @@ static int n810_set_input(struct snd_kcontrol *kcontrol,
|
||||
{
|
||||
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
|
||||
|
||||
if (n810_dmic_func == ucontrol->value.integer.value[0])
|
||||
if (n810_dmic_func == ucontrol->value.enumerated.item[0])
|
||||
return 0;
|
||||
|
||||
n810_dmic_func = ucontrol->value.integer.value[0];
|
||||
n810_dmic_func = ucontrol->value.enumerated.item[0];
|
||||
n810_ext_control(&card->dapm);
|
||||
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user