korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rt1011: Fix 'I2S Reference' enum control caused error

Browse Source 
Access to 'I2S Reference' enum causes alsamixer to fail to load:
$ alsamixer
cannot load mixer controls: Invalid argument

cml_rt1011_rt5682 cml_rt1011_rt5682: control 2:0:0:TL I2S Reference:0: access overflow

The reason is that the original patch adding the code was using
ucontrol->value.integer.value[0]
instead the correct
ucontrol->value.enumerated.item[0]

for an ENUM control.

Fixes: 87f40af26c ("ASoC: rt1011: add i2s reference control for rt1011")
Reported-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20211011144518.2518-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2021-10-11 17:45:18 +03:00 committed by Mark Brown
parent 45ea862008
commit c3de683c4d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/rt1011.c
View File

@ -1311,12 +1311,11 @@ static int rt1011_r0_load_info(struct snd_kcontrol *kcontrol,
.put = rt1011_r0_load_mode_put \
}
static const char * const rt1011_i2s_ref[] = {
static const char * const rt1011_i2s_ref_texts[] = {
"None", "Left Channel", "Right Channel"
};
static SOC_ENUM_SINGLE_DECL(rt1011_i2s_ref_enum, 0, 0,
rt1011_i2s_ref);
static SOC_ENUM_SINGLE_EXT_DECL(rt1011_i2s_ref_enum, rt1011_i2s_ref_texts);
static int rt1011_i2s_ref_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
@ -1325,7 +1324,7 @@ static int rt1011_i2s_ref_put(struct snd_kcontrol *kcontrol,
snd_soc_kcontrol_component(kcontrol);
struct rt1011_priv *rt1011 =
snd_soc_component_get_drvdata(component);
int i2s_ref_ch = ucontrol->value.integer.value[0];
int i2s_ref_ch = ucontrol->value.enumerated.item[0];
switch (i2s_ref_ch) {
case RT1011_I2S_REF_LEFT_CH:
@ -1344,7 +1343,7 @@ static int rt1011_i2s_ref_put(struct snd_kcontrol *kcontrol,
dev_info(component->dev, "I2S Reference: Do nothing\n");
}
rt1011->i2s_ref = ucontrol->value.integer.value[0];
rt1011->i2s_ref = ucontrol->value.enumerated.item[0];
return 0;
}
@ -1357,7 +1356,7 @@ static int rt1011_i2s_ref_get(struct snd_kcontrol *kcontrol,
struct rt1011_priv *rt1011 =
snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = rt1011->i2s_ref;
ucontrol->value.enumerated.item[0] = rt1011->i2s_ref;
return 0;
}