2 files changed, 13 insertions, 0 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 76714be19e9d..b25bf0ffc947 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -474,6 +474,7 @@ struct snd_soc_dapm_widget {
         /* kcontrols that relate to this widget */
         int num_kcontrols;
         const struct snd_kcontrol_new *kcontrol_news;
+        struct snd_kcontrol **kcontrols;
 
         /* widget input and outputs */
         struct list_head sources;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 35cc1ed00a44..85b2c94535f4 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -400,6 +400,7 @@ static int dapm_new_mixer(struct snd_soc_dapm_context *dapm,
                                 path->long_name = NULL;
                                 return ret;
                         }
+                        w->kcontrols[i] = path->kcontrol;
                 }
         }
         return ret;
@@ -442,6 +443,8 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm,
         if (ret < 0)
                 goto err;
 
+        w->kcontrols[0] = kcontrol;
+
         list_for_each_entry(path, &w->sources, list_sink)
                 path->kcontrol = kcontrol;
 
@@ -1480,6 +1483,7 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
                         kfree(p->long_name);
                         kfree(p);
                 }
+                kfree(w->kcontrols);
                 kfree(w->name);
                 kfree(w);
         }
@@ -1730,6 +1734,14 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
                 if (w->new)
                         continue;
 
+                if (w->num_kcontrols) {
+                        w->kcontrols = kzalloc(w->num_kcontrols *
+                                                sizeof(struct snd_kcontrol *),
+                                                GFP_KERNEL);
+                        if (!w->kcontrols)
+                                return -ENOMEM;
+                }
+
                 switch(w->id) {
                 case snd_soc_dapm_switch:
                 case snd_soc_dapm_mixer: