summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKoro Chen <koro.chen@mediatek.com>2015-05-11 10:36:53 +0800
committerMark Brown <broonie@kernel.org>2015-05-12 19:01:56 +0100
commitfdb6eb0a12871d5bfaf266c5a0d5259a5437a72f (patch)
treeb9705ad8193f8059284e88f2b74403c0b47a3fac /sound
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
downloadlinux-fdb6eb0a12871d5bfaf266c5a0d5259a5437a72f.tar.bz2
ASoC: dapm: Modify widget stream name according to prefix
When there is prefix specified, currently we will add this prefix in widget->name, but not in widget->sname. it causes failure at snd_soc_dapm_link_dai_widgets: if (!w->sname || !strstr(w->sname, dai_w->name)) because dai_w->name has prefix added, but w->sname does not. We should also add prefix for stream name Signed-off-by: Koro Chen <koro.chen@mediatek.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index defe0f0082b5..158204d08924 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3100,11 +3100,16 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
}
prefix = soc_dapm_prefix(dapm);
- if (prefix)
+ if (prefix) {
w->name = kasprintf(GFP_KERNEL, "%s %s", prefix, widget->name);
- else
+ if (widget->sname)
+ w->sname = kasprintf(GFP_KERNEL, "%s %s", prefix,
+ widget->sname);
+ } else {
w->name = kasprintf(GFP_KERNEL, "%s", widget->name);
-
+ if (widget->sname)
+ w->sname = kasprintf(GFP_KERNEL, "%s", widget->sname);
+ }
if (w->name == NULL) {
kfree(w);
return NULL;