On 6/17/22 14:07, Sameer Pujar wrote:
> 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 <spujar@xxxxxxxxxx>
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
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!
> ---
> sound/soc/soc-ops.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
> index 0267e39..21be8e8 100644
> --- a/sound/soc/soc-ops.c
> +++ b/sound/soc/soc-ops.c
> @@ -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;
