Skip to content

Commit

Permalink
ASoC: wm8903: Fix wrong value references for boolean kctl
Browse files Browse the repository at this point in the history
The correct values referred by a boolean control are
value.integer.value[], not value.enumerated.item[].
The former is long while the latter is int, so it's even incompatible
on 64bit architectures.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org>
  • Loading branch information
Takashi Iwai authored and Mark Brown committed Mar 10, 2015
1 parent bd14016 commit 24cc883
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/codecs/wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ static int wm8903_get_deemph(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);

ucontrol->value.enumerated.item[0] = wm8903->deemph;
ucontrol->value.integer.value[0] = wm8903->deemph;

return 0;
}
Expand All @@ -452,7 +452,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
{
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
int deemph = ucontrol->value.enumerated.item[0];
int deemph = ucontrol->value.integer.value[0];
int ret = 0;

if (deemph > 1)
Expand Down

0 comments on commit 24cc883

Please sign in to comment.