Skip to content

Commit

Permalink
ASoC: pxa: spitz: Fix enum ctl accesses in a wrong type
Browse files Browse the repository at this point in the history
"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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Takashi Iwai authored and Mark Brown committed Mar 1, 2016
1 parent 7a3f4b4 commit 49a1ba1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sound/soc/pxa/spitz.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static struct snd_soc_ops spitz_ops = {
static int spitz_get_jack(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
ucontrol->value.integer.value[0] = spitz_jack_func;
ucontrol->value.enumerated.item[0] = spitz_jack_func;
return 0;
}

Expand All @@ -173,18 +173,18 @@ static int spitz_set_jack(struct snd_kcontrol *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;

spitz_jack_func = ucontrol->value.integer.value[0];
spitz_jack_func = ucontrol->value.enumerated.item[0];
spitz_ext_control(&card->dapm);
return 1;
}

static int spitz_get_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
ucontrol->value.integer.value[0] = spitz_spk_func;
ucontrol->value.enumerated.item[0] = spitz_spk_func;
return 0;
}

Expand All @@ -193,10 +193,10 @@ static int spitz_set_spk(struct snd_kcontrol *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;

spitz_spk_func = ucontrol->value.integer.value[0];
spitz_spk_func = ucontrol->value.enumerated.item[0];
spitz_ext_control(&card->dapm);
return 1;
}
Expand Down

0 comments on commit 49a1ba1

Please sign in to comment.