diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-22 23:01:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-22 23:01:04 +0200 |
| commit | 31835046beba8890e34ea79ca7e5aa7811cbfa4a (patch) | |
| tree | bf4b1cf7511f771f212d71f01c1f2c345d658811 /sound | |
| parent | Linux 3.15-rc2 (diff) | |
| parent | ASoC: dapm: Fix widget double free with auto-disable DAPM kcontrol (diff) | |
| download | linux-31835046beba8890e34ea79ca7e5aa7811cbfa4a.tar.xz linux-31835046beba8890e34ea79ca7e5aa7811cbfa4a.zip | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-dapm.c | 1 |
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); } |