Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1d83a40..3dc1b8a 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2675,12 +2675,18 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
                kfree(w);
                return -ENOMEM;
        }
-       if (dapm->codec && dapm->codec->name_prefix)
+       if (dapm->codec && dapm->codec->name_prefix) {
                snprintf(w->name, name_len, "%s %s",
                        dapm->codec->name_prefix, widget->name);
-       else
+               if (widget->sname)
+                       w->sname = kasprintf(GFP_KERNEL, "%s %s",
+                                            dapm->codec->name_prefix,
+                                            widget->sname);
+       } else {
                snprintf(w->name, name_len, "%s", widget->name);
-
+               if (widget->sname)
+                       w->sname = kasprintf(GFP_KERNEL, "%s", widget->sname);
+       }
        switch (w->id) {
        case snd_soc_dapm_switch:
        case snd_soc_dapm_mixer: