diff options
| author | Axel Lin | 2010-11-19 10:31:08 +0100 |
|---|---|---|
| committer | Liam Girdwood | 2010-11-19 13:14:47 +0100 |
| commit | 5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d (patch) | |
| tree | 8c360d75728a96a5064bb609e87d13647b02c8ca /sound/soc/codecs/twl4030.c | |
| parent | ASoC: tpa6130a2: Revisit power-up sequence (diff) | |
| download | kernel-qcow2-linux-5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d.tar.gz kernel-qcow2-linux-5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d.tar.xz kernel-qcow2-linux-5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d.zip | |
ASoC: Move kfree(twl4030) to twl4030_soc_remove()
As we allocate memory for twl4030 in twl4030_codec_probe(),
twl4030_codec_remove() is a better place to free the memory.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/twl4030.c')
| -rw-r--r-- | sound/soc/codecs/twl4030.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index a6ceddb0bb7d..3820885c8c2a 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2272,9 +2272,12 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) static int twl4030_soc_remove(struct snd_soc_codec *codec) { + struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + /* Reset registers to their chip default before leaving */ twl4030_reset_registers(codec); twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF); + kfree(twl4030); return 0; } @@ -2306,10 +2309,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev) static int __devexit twl4030_codec_remove(struct platform_device *pdev) { - struct twl4030_priv *twl4030 = dev_get_drvdata(&pdev->dev); - snd_soc_unregister_codec(&pdev->dev); - kfree(twl4030); return 0; } |