leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"DAC1 High Pass Filter Mode" & co in da732x codec 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>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Takashi Iwai 2016-02-29 18:04:42 +01:00 committed by Mark Brown
parent 92e963f50f
commit fe9aba1310
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/da732x.c
View File

@ -334,7 +334,7 @@ static int da732x_hpf_set(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value; struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;
unsigned int reg = enum_ctrl->reg; unsigned int reg = enum_ctrl->reg;
unsigned int sel = ucontrol->value.integer.value[0]; unsigned int sel = ucontrol->value.enumerated.item[0];
unsigned int bits; unsigned int bits;
switch (sel) { switch (sel) {
@ -368,13 +368,13 @@ static int da732x_hpf_get(struct snd_kcontrol *kcontrol,
switch (val) { switch (val) {
case DA732X_HPF_VOICE_EN: case DA732X_HPF_VOICE_EN:
ucontrol->value.integer.value[0] = DA732X_HPF_VOICE; ucontrol->value.enumerated.item[0] = DA732X_HPF_VOICE;
break; break;
case DA732X_HPF_MUSIC_EN: case DA732X_HPF_MUSIC_EN:
ucontrol->value.integer.value[0] = DA732X_HPF_MUSIC; ucontrol->value.enumerated.item[0] = DA732X_HPF_MUSIC;
break; break;
default: default:
ucontrol->value.integer.value[0] = DA732X_HPF_DISABLED; ucontrol->value.enumerated.item[0] = DA732X_HPF_DISABLED;
break; break;
} }