summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/goni_wm8994.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-26 14:51:56 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-29 10:59:03 +0000
commit853dc30274878d14b7abef8313c801f5559b4c47 (patch)
treeb9c38fc6bb6d5d2b9e577abfb83453db11d8ba6e /sound/soc/samsung/goni_wm8994.c
parent39fb51a123c125e36e9bcb67686b3e2945784250 (diff)
ASoC: Fix resource leak in goni_wm8994.c
Properly free allocated resources in goni_init() error path. Add missing snd_soc_unregister_dai() in goni_exit(). Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung/goni_wm8994.c')
-rw-r--r--sound/soc/samsung/goni_wm8994.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index dcfac546cb81..cc8528c0a49a 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -283,20 +283,25 @@ static int __init goni_init(void)
/* register voice DAI here */
ret = snd_soc_register_dai(&goni_snd_device->dev, &voice_dai);
- if (ret)
+ if (ret) {
+ platform_device_put(goni_snd_device);
return ret;
+ }
platform_set_drvdata(goni_snd_device, &goni);
ret = platform_device_add(goni_snd_device);
- if (ret)
+ if (ret) {
+ snd_soc_unregister_dai(&goni_snd_device->dev);
platform_device_put(goni_snd_device);
+ }
return ret;
}
static void __exit goni_exit(void)
{
+ snd_soc_unregister_dai(&goni_snd_device->dev);
platform_device_unregister(goni_snd_device);
}