ASoC: Fix memory allocation for snd_soc_dapm_switch names

snd_soc_dapm_switch ends up ends up in dapm_new_mixer() (since a switch
is a special case of a mixer with only one input) but this wasn't
correctly handled in the code.

Also fix the coding style for the switch below while we're here.

Reported-by: Joonyoung Shim <dofmind@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7da6d0db40f2..735903a74675 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -332,7 +332,7 @@ static int dapm_new_mixer(struct snd_soc_codec *codec,
                          * kcontrol name.
                          */
                         name_len = strlen(w->kcontrols[i].name) + 1;
-                        if (w->id == snd_soc_dapm_mixer)
+                        if (w->id != snd_soc_dapm_mixer_named_ctl)
                                 name_len += 1 + strlen(w->name);
 
                         path->long_name = kmalloc(name_len, GFP_KERNEL);
@@ -341,15 +341,14 @@ static int dapm_new_mixer(struct snd_soc_codec *codec,
                                 return -ENOMEM;
 
                         switch (w->id) {
-                        case snd_soc_dapm_mixer:
                         default:
                                 snprintf(path->long_name, name_len, "%s %s",
                                          w->name, w->kcontrols[i].name);
-                        break;
+                                break;
                         case snd_soc_dapm_mixer_named_ctl:
                                 snprintf(path->long_name, name_len, "%s",
                                          w->kcontrols[i].name);
-                        break;
+                                break;
                         }
 
                         path->long_name[name_len - 1] = '\0';