summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-22 22:01:04 +0100
committerMark Brown <broonie@linaro.org>2014-04-22 22:01:04 +0100
commit31835046beba8890e34ea79ca7e5aa7811cbfa4a (patch)
treebf4b1cf7511f771f212d71f01c1f2c345d658811 /sound
parenta798c10faf62a505d24e5f6213fbaf904a39623f (diff)
parent2697e4fb9209dfe1d1b24c92d254158f63d4bc8e (diff)
downloadlinux-31835046beba8890e34ea79ca7e5aa7811cbfa4a.tar.bz2
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index c8a780d0d057..7769b0a2bc5a 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -254,7 +254,6 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,
static void dapm_kcontrol_free(struct snd_kcontrol *kctl)
{
struct dapm_kcontrol_data *data = snd_kcontrol_chip(kctl);
- kfree(data->widget);
kfree(data->wlist);
kfree(data);
}