Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-02 16:44:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: ops: Fix boolean/integer detection for simple controls

Browse Source 
The standard snd_soc_info_volsw() detects if a control is a volume control
and needs to be reported as an integer even if it only has two values by
looking for the string " Volume" in the control name. This results in false
positives if the control has a name like "HP Volume Ramp Switch" since any
" Volume" is matched, not just a trailing one. Fix this by making sure that
we only match at the end of the control name.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220604105407.4055294-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mark Brown 2022-06-04 11:54:07 +01:00
parent a150345aa7
commit aa2a4b8971
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/soc-ops.c
View File

@ -176,13 +176,21 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
{ {
struct soc_mixer_control *mc = struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value; (struct soc_mixer_control *)kcontrol->private_value;
const char *vol_string = NULL;
int max; int max;
max = uinfo->value.integer.max = mc->max - mc->min; max = uinfo->value.integer.max = mc->max - mc->min;
if (mc->platform_max && mc->platform_max < max) if (mc->platform_max && mc->platform_max < max)
max = mc->platform_max; max = mc->platform_max;
if (max == 1 && !strstr(kcontrol->id.name, " Volume")) /* Even two value controls ending in Volume should always be integer */
if (max == 1) {
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; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
else else
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;