From: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri, 14 Jun 2013 11:16:51 +0000 (+0200)
Subject: ASoC: dapm: Setup private_free callback for dapm kcontrols
X-Git-Tag: v3.12-rc1~201^2~16^2~1^2~29^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b75bf0c5b17d71c3b0568caaaaae73a22f83826;p=kernel%2Fkernel-generic.git

ASoC: dapm: Setup private_free callback for dapm kcontrols

The private data containing the widget list that is a assigned to a DAPM
kcontrol is never freed. Setup the private_free for DAPM kcontrols to take care
of this.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index a80c883..9dd2d1d 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -504,6 +504,11 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
 	return 0;
 }
 
+static void dapm_kcontrol_free(struct snd_kcontrol *kctl)
+{
+	kfree(kctl->private_data);
+}
+
 /*
  * Determine if a kcontrol is shared. If it is, look it up. If it isn't,
  * create it. Either way, add the widget into the control's widget list
@@ -617,6 +622,7 @@ static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w,
 
 		kcontrol = snd_soc_cnew(&w->kcontrol_news[kci], wlist, name,
 					prefix);
+		kcontrol->private_free = dapm_kcontrol_free;
 		ret = snd_ctl_add(card, kcontrol);
 		if (ret < 0) {
 			dev_err(dapm->dev,