diff options
| author | Mark Brown | 2010-11-23 15:30:41 +0100 |
|---|---|---|
| committer | Mark Brown | 2010-11-23 15:30:41 +0100 |
| commit | d50a87402e29e16a63152be810d9723ce4d87e37 (patch) | |
| tree | 968932ec54cffd983b46bfb43d571c4d0d355561 /sound/soc/codecs/wm8994.c | |
| parent | ASoC: Samsung: Rename from s3c24xx to samsung (diff) | |
| parent | ASoC: wm8994 - fix memory leaks (diff) | |
| download | kernel-qcow2-linux-d50a87402e29e16a63152be810d9723ce4d87e37.tar.gz kernel-qcow2-linux-d50a87402e29e16a63152be810d9723ce4d87e37.tar.xz kernel-qcow2-linux-d50a87402e29e16a63152be810d9723ce4d87e37.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 63a3895b021a..283399468b0c 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2503,6 +2503,8 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_DET, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_DET, wm8994); + kfree(wm8994->retune_mobile_texts); + kfree(wm8994->drc_texts); kfree(wm8994); return 0; |