Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 10:46:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
"PCM channel mixer" ctl in cs42l51 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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Takashi Iwai 2016-02-29 18:02:59 +01:00 committed by Mark Brown
parent 92e963f50f
commit 89300b4e5a
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/cs42l51.c
View File

@ -60,15 +60,15 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,
switch (value) { switch (value) {
default: default:
case 0: case 0:
ucontrol->value.integer.value[0] = 0; ucontrol->value.enumerated.item[0] = 0;
break; break;
/* same value : (L+R)/2 and (R+L)/2 */ /* same value : (L+R)/2 and (R+L)/2 */
case 1: case 1:
case 2: case 2:
ucontrol->value.integer.value[0] = 1; ucontrol->value.enumerated.item[0] = 1;
break; break;
case 3: case 3:
ucontrol->value.integer.value[0] = 2; ucontrol->value.enumerated.item[0] = 2;
break; break;
} }
@ -85,7 +85,7 @@ static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
unsigned char val; unsigned char val;
switch (ucontrol->value.integer.value[0]) { switch (ucontrol->value.enumerated.item[0]) {
default: default:
case 0: case 0:
val = CHAN_MIX_NORMAL; val = CHAN_MIX_NORMAL;