Commit fdb6eb0a authored May 11, 2015 by Koro Chen Committed by Mark Brown May 12, 2015

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

parent b787f68c

sound/soc/soc-dapm.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message