mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ASoC: Remove DAPM restriction on mixer control name lengths 

As well as ensuring that UI-relevant parts of control names don't get
truncated in the DAPM code this avoids conflicts in long control names
that differ only at the end of a long string.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2008-10-28 13:02:31 +00:00
parent f24368c2fb
commit 219b93f525
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/soc-dapm.c
View File

@ -289,7 +289,7 @@ static int dapm_new_mixer(struct snd_soc_codec *codec,
struct snd_soc_dapm_widget *w)
{
int i, ret = 0;
char name[32];
size_t name_len;
struct snd_soc_dapm_path *path;
/* add kcontrol */
@ -303,11 +303,16 @@ static int dapm_new_mixer(struct snd_soc_codec *codec,
continue;
/* add dapm control with long name */
snprintf(name, 32, "%s %s", w->name, w->kcontrols[i].name);
path->long_name = kstrdup (name, GFP_KERNEL);
name_len = 2 + strlen(w->name)
+ strlen(w->kcontrols[i].name);
path->long_name = kmalloc(name_len, GFP_KERNEL);
if (path->long_name == NULL)
return -ENOMEM;
snprintf(path->long_name, name_len, "%s %s",
w->name, w->kcontrols[i].name);
path->long_name[name_len - 1] = '\0';
path->kcontrol = snd_soc_cnew(&w->kcontrols[i], w,
path->long_name);
ret = snd_ctl_add(codec->card, path->kcontrol);