Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x...

diff --cc sound/soc/soc-topology.c
index 782c580,01a5041,01a5041,01a5041,b363f24,01a5041..fa27d0f
--- 1/sound/soc/soc-topology.c
--- 2/sound/soc/soc-topology.c
--- 3/sound/soc/soc-topology.c
--- 4/sound/soc/soc-topology.c
--- 5/sound/soc/soc-topology.c
--- 6/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@@@@@@ -523,9 -523,8 -523,8 -523,8 -526,7 -523,8 +526,8 @@@@@@@ static void remove_widget(struct snd_so
                                kfree(se->dobj.control.dtexts[j]);
      
                        kfree(se);
 +++++                  kfree(w->kcontrol_news[i].name);
                }
---- -          kfree(w->kcontrol_news);
        } else {
                /* volume mixer or bytes controls */
                for (i = 0; i < w->num_kcontrols; i++) {
@@@@@@@ -541,10 -540,9 -540,9 -540,9 -542,12 -540,9 +543,13 @@@@@@@
                         */
                        kfree((void *)kcontrol->private_value);
                        snd_ctl_remove(card, kcontrol);
 +++++                  kfree(w->kcontrol_news[i].name);
                }
---- -          kfree(w->kcontrol_news);
        }
++++ +
++++ +free_news:
++++ +  kfree(w->kcontrol_news);
++++ +
        /* widget w is freed by soc-dapm.c */
      }