Hi,
On 11/10/2021 17:45, Peter Ujfalusi wrote:
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: 87f40af26c262 ("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
Hi,
Changes since v2:
- Fix typo in commit message s/Is@/I2S
Changes since v1:
- Correct the ENUM declaration as well
After a third look, 87f40af26c262 appears mostly a broken patch, it will take a bit more patching to get it right.
I will send a new version with different subject to fix it, or it can be reverted (yes, it is that broken).
Regards, Peter sound/soc/codecs/rt1011.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 508597866dff..bdfcbb81fa19 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -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;
}