commit 4d74b36431f9b453bbe9d2af7c37875fc5cc442e
author Liam Girdwood <lrg@ti.com> Wed May 18 17:50:07 2011 +0100
committer Sebastien Guiriec <s-guiriec@ti.com> Sun Jul 24 21:31:58 2011 +0200
tree 5a31f41b53dd81782ca4406294bc5764bcb2be03
parent 54cd5ccef4314f734af9966dca848e85a092e2b7

ASoC: dapm - fix prefix for DAPM muxes

Make sure DAPM muxes have a valid kcontrol name instead of NULL.

Signed-off-by: Liam Girdwood <lrg@ti.com>

sound/soc/soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 32ab7fc..f031764 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -492,10 +492,10 @@
 	wlist->widgets[wlistentries - 1] = w;
 
 	if (!kcontrol) {
-		if (dapm->codec)
+		if (dapm->codec && dapm->codec->name_prefix)
 			prefix = dapm->codec->name_prefix;
 		else
-			prefix = NULL;
+			prefix = w->name;
 
 		if (shared) {
 			name = w->kcontrol_news[0].name;