Patch "ASoC: dapm: Modify widget stream name according to prefix" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

ASoC: dapm: Modify widget stream name according to prefix

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-dapm-modify-widget-stream-name-according-to-prefix.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Koro Chen <[email protected]>
Date: Mon, 11 May 2015 10:36:53 +0800
Subject: ASoC: dapm: Modify widget stream name according to prefix

From: Koro Chen <[email protected]>

commit fdb6eb0a12871d5bfaf266c5a0d5259a5437a72f upstream.

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

---
 sound/soc/soc-dapm.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

@@ -3074,11 +3074,16 @@ snd_soc_dapm_new_control(struct snd_soc_
 	}
 
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/asoc-dapm-modify-widget-stream-name-according-to-prefix.patch