2010-11-23 07:51:19

by Axel Lin

Subject: [PATCH 1/3] ASoC: max98088 - fix a memory leak

Signed-off-by: Axel Lin <[email protected]>
---
sound/soc/codecs/max98088.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 4ee5b1a..b679586 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -2020,7 +2020,10 @@ err_access:

static int max98088_remove(struct snd_soc_codec *codec)
{
+ struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
+
max98088_set_bias_level(codec, SND_SOC_BIAS_OFF);
+ kfree(max98088->eq_texts);

return 0;
}
--
1.7.2

2010-11-23 07:52:45

by Axel Lin

Subject: [PATCH 2/3] ASoC: wm8904 - fix memory leaks

Signed-off-by: Axel Lin <[email protected]>
---
sound/soc/codecs/wm8904.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index da91928..d0024666 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2498,6 +2498,8 @@ static int wm8904_remove(struct snd_soc_codec *codec)

wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF);
regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies);
+ kfree(wm8904->retune_mobile_texts);
+ kfree(wm8904->drc_texts);

return 0;
}
--
1.7.2

2010-11-23 07:53:36

by Axel Lin

Subject: [PATCH 3/3] ASoC: wm8994 - fix memory leaks

Signed-off-by: Axel Lin <[email protected]>
---
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 63a3895..2833994 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;
--
1.7.2

2010-11-23 10:33:30

by Liam Girdwood

Subject: Re: [PATCH 1/3] ASoC: max98088 - fix a memory leak

On Tue, 2010-11-23 at 15:56 +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <[email protected]>
> ---
> sound/soc/codecs/max98088.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
> index 4ee5b1a..b679586 100644
> --- a/sound/soc/codecs/max98088.c
> +++ b/sound/soc/codecs/max98088.c
> @@ -2020,7 +2020,10 @@ err_access:
>
> static int max98088_remove(struct snd_soc_codec *codec)
> {
> + struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
> +
> max98088_set_bias_level(codec, SND_SOC_BIAS_OFF);
> + kfree(max98088->eq_texts);
>
> return 0;
> }

All

Acked-by: Liam Girdwood <[email protected]>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

2010-11-23 14:53:26

by Mark Brown

Subject: Re: [PATCH 1/3] ASoC: max98088 - fix a memory leak

On Tue, Nov 23, 2010 at 10:33:24AM +0000, Liam Girdwood wrote:
> On Tue, 2010-11-23 at 15:56 +0800, Axel Lin wrote:
> > Signed-off-by: Axel Lin <[email protected]>

> Acked-by: Liam Girdwood <[email protected]>

Applied, thanks.