Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

12a04231 · Mark Brown · 030bbdbf · fdb6eb0a · 12a04231
Commit 12a04231 authored May 12, 2015 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

sound/soc/soc-dapm.c sound/soc/soc-dapm.c +8 -3

No files found.
--- 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;