Commit 39a79fe1 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown

ASoC: wm9081: Fix enum ctl accesses in a wrong type

"Speaker Mode "ctl in wm9081 codec driver is 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 92e963f5
...@@ -344,9 +344,9 @@ static int speaker_mode_get(struct snd_kcontrol *kcontrol, ...@@ -344,9 +344,9 @@ static int speaker_mode_get(struct snd_kcontrol *kcontrol,
reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2); reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2);
if (reg & WM9081_SPK_MODE) if (reg & WM9081_SPK_MODE)
ucontrol->value.integer.value[0] = 1; ucontrol->value.enumerated.item[0] = 1;
else else
ucontrol->value.integer.value[0] = 0; ucontrol->value.enumerated.item[0] = 0;
return 0; return 0;
} }
...@@ -365,7 +365,7 @@ static int speaker_mode_put(struct snd_kcontrol *kcontrol, ...@@ -365,7 +365,7 @@ static int speaker_mode_put(struct snd_kcontrol *kcontrol,
unsigned int reg2 = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2); unsigned int reg2 = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2);
/* Are we changing anything? */ /* Are we changing anything? */
if (ucontrol->value.integer.value[0] == if (ucontrol->value.enumerated.item[0] ==
((reg2 & WM9081_SPK_MODE) != 0)) ((reg2 & WM9081_SPK_MODE) != 0))
return 0; return 0;
...@@ -373,7 +373,7 @@ static int speaker_mode_put(struct snd_kcontrol *kcontrol, ...@@ -373,7 +373,7 @@ static int speaker_mode_put(struct snd_kcontrol *kcontrol,
if (reg_pwr & WM9081_SPK_ENA) if (reg_pwr & WM9081_SPK_ENA)
return -EINVAL; return -EINVAL;
if (ucontrol->value.integer.value[0]) { if (ucontrol->value.enumerated.item[0]) {
/* Class AB */ /* Class AB */
reg2 &= ~(WM9081_SPK_INV_MUTE | WM9081_OUT_SPK_CTRL); reg2 &= ~(WM9081_SPK_INV_MUTE | WM9081_OUT_SPK_CTRL);
reg2 |= WM9081_SPK_MODE; reg2 |= WM9081_SPK_MODE;
......
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