From: Mark Brown <broonie@kernel.org>
Date: Wed, 28 Mar 2018 02:31:04 +0000 (+0800)
Subject: Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ec67b19f952ce8eb40b27260815c7eec2d23426e;p=linux.git

Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/topology' and 'asoc/topic/tscs42xx' into asoc-next
---

ec67b19f952ce8eb40b27260815c7eec2d23426e
diff --cc sound/soc/soc-topology.c
index 782c580b7aa32,01a50413c66f6,01a50413c66f6,01a50413c66f6,b363f2409f727,01a50413c66f6..fa27d0fca6dce
--- a/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 */
      }