| Message ID | 20211011141543.31030-1-peter.ujfalusi@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: rt1011: Fix 'I2S Reference' enum control caused error | expand |
On 11/10/2021 17:15, Peter Ujfalusi wrote: > Access to 'Is@ 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. I have noticed that the ENUM declaration was wrong as well, sent v2 to fix it also. > > 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> > --- > sound/soc/codecs/rt1011.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c > index 508597866dff..3adaff6f0141 100644 > --- a/sound/soc/codecs/rt1011.c > +++ b/sound/soc/codecs/rt1011.c > @@ -1325,7 +1325,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 +1344,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 +1357,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; > } >
diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 508597866dff..3adaff6f0141 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -1325,7 +1325,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 +1344,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 +1357,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; }
Access to 'Is@ 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> --- sound/soc/codecs/rt1011.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)