ASoC: ops: Fix integer detection for when max possible values > 1
PATCH 1/1 ASoC: ops: Fix integer detection for when max possible values > 1
The standard snd_soc_info_volsw() allows a two value control to be defined as an integer control only if the control name ends in "Volume". It achieves this by creating a substring if it contains " Volume", and ensuring this exists at the end of the name. The volume substring is then used to decide whether the type is a SNDRV_CTL_ELEM_TYPE_INTEGER or SNDRV_CTL_ELEM_TYPE_BOOLEAN. However this volume substring is only computed for a two value control.
This means for controls where there are more than two possible values, the substring is never created, so in this case the substring remains NULL, and the condition yields SNDRV_CTL_ELEM_TYPE_BOOLEAN, even though there are more than 2 possible values.
If there are more than 2 possible values for the control, then it should always be an integer control.
--- sound/soc/soc-ops.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
sound/soc/soc-ops.c +7 -8
@@ -183,17 +183,16 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,if (mc->platform_max && mc->platform_max < max) max = mc->platform_max; -/* Even two value controls ending in Volume should always be integer */ if (max ==1 ) { +/* Even two value controls ending in Volume should always be integer */ vol_string =strstr (kcontrol->id.name," Volume" ); -if (vol_string &&strcmp (vol_string," Volume" )) - vol_string =NULL ; - } - -if (!vol_string) - uinfo->type =SNDRV_CTL_ELEM_TYPE_BOOLEAN ; -else +if (vol_string && !strcmp (vol_string," Volume" )) + uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; +else + uinfo->type =SNDRV_CTL_ELEM_TYPE_BOOLEAN ; + }else { uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; + } uinfo->count =snd_soc_volsw_is_stereo (mc) ?2 :1 ; uinfo->value.integer.min =0 ;
Signature · 1 line
2.25.1
Quoted 16 lines · Stefan Binding
The standard
snd_soc_info_volsw()allows a two value control to be defined as an integer control only if the control name ends in "Volume". It achieves this by creating a substring if it contains " Volume", and ensuring this exists at the end of the name. The volume substring is then used to decide whether the type is aSNDRV_CTL_ELEM_TYPE_INTEGERorSNDRV_CTL_ELEM_TYPE_BOOLEAN. However this volume substring is only computed for a two value control.
This means for controls where there are more than two possible values, the substring is never created, so in this case the substring remains NULL, and the condition yieldsSNDRV_CTL_ELEM_TYPE_BOOLEAN, even though there are more than 2 possible values.
If there are more than 2 possible values for the control, then it should always be an integer control.
Quoted 4 lines
Fixes aa2a4b897132 ("ASoC: ops: Fix boolean/integer detection for simple controls")Signed-off-by Stefan Binding <[email protected]>---
Thanks,
Charles
Mark Brown
maintainerQuoted 16 lines · Stefan Binding
The standard
snd_soc_info_volsw()allows a two value control to be defined as an integer control only if the control name ends in "Volume". It achieves this by creating a substring if it contains " Volume", and ensuring this exists at the end of the name. The volume substring is then used to decide whether the type is aSNDRV_CTL_ELEM_TYPE_INTEGERorSNDRV_CTL_ELEM_TYPE_BOOLEAN. However this volume substring is only computed for a two value control.
This means for controls where there are more than two possible values, the substring is never created, so in this case the substring remains NULL, and the condition yieldsSNDRV_CTL_ELEM_TYPE_BOOLEAN, even though there are more than 2 possible values.
If there are more than 2 possible values for the control, then it should always be an integer control.
Quoted 1 line
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: ops: Fix integer detection for when max possible values > 1
commit: 442302003bd2b151e12d52b0af9a7dac131bf931
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark