ASoC: ops: Fix multiple value control type
Subsystems (3)
PATCH 1/1 ASoC: ops: Fix multiple value control type
The commit aa2a4b897132("ASoC: ops: Fix boolean/integer detection for simple controls") fixes false positives with controls not ending in " Volume" string. But it now forces boolean type for the multi value controls. Fix this by adding a max check before assigning types.
--- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-ops.c +1 -1
@@ -190,7 +190,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, vol_string =NULL ; } -if (!vol_string) +if (!vol_string && max ==1 ) uinfo->type =SNDRV_CTL_ELEM_TYPE_BOOLEAN ;else uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ;
Signature · 1 line
2.7.4
Quoted 7 lines · Sameer Pujar
The commit
aa2a4b897132("ASoC: ops: Fix boolean/integer detection for simple controls")fixes false positives with controls not ending in " Volume" string. But it now forces boolean type for the multi value controls. Fix this by adding a max check before assigning types.Fixes aa2a4b897132("ASoC: ops: Fix boolean/integer detection for simple controls")Signed-off-by Sameer Pujar <[email protected]>
This fixes the second regression we noticed today, with mixer values such as:
numid=5,iface=MIXER,name='PGA4.0 4 Master Capture Volume'
; type=BOOLEAN,access=rw---R--,values=2
: values=on,on
| dBscale-min=-50.00dB,step=1.00dB,mute=1
This caused an across-the-board fail with alsa-bat tests
https://github.com/thesofproject/linux/pull/3702
Thanks Sameer!
Quoted 17 lines
--- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/soc-ops.c +1
-1@@ -190,7 +190,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, vol_string =NULL ; } -if (!vol_string) +if (!vol_string && max ==1 ) uinfo->type =SNDRV_CTL_ELEM_TYPE_BOOLEAN ;else uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ;
Mark Brown
maintainerQuoted 4 lines · Sameer Pujar
The commit
aa2a4b897132("ASoC: ops: Fix boolean/integer detection for simple controls")fixes false positives with controls not ending in " Volume" string. But it now forces boolean type for the multi value controls. Fix this by adding a max check before assigning types.
Thanks but someone already sent a fix for this.