ASoC: Fix resource leak in smdk_spdif.c
authorAxel Lin <axel.lin@gmail.com>
Fri, 26 Nov 2010 06:54:42 +0000 (14:54 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Nov 2010 11:01:06 +0000 (11:01 +0000)
Properly free allocated resources in smdk_init() error path.
Add missing platform_device_unregister() in smdk_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>
sound/soc/samsung/smdk_spdif.c

index cd29da089c8fd0c3943e7b7b4814a4305271c28b..ca779ad1613c05c43b4c387dde983e6b458b6704 100644 (file)
@@ -183,7 +183,7 @@ static int __init smdk_init(void)
 
        ret = platform_device_add(smdk_snd_spdif_dit_device);
        if (ret)
-               goto err2;
+               goto err1;
 
        smdk_snd_spdif_device = platform_device_alloc("soc-audio", -1);
        if (!smdk_snd_spdif_device) {
@@ -195,17 +195,21 @@ static int __init smdk_init(void)
 
        ret = platform_device_add(smdk_snd_spdif_device);
        if (ret)
-               goto err1;
+               goto err3;
 
        /* Set audio clock heirachy manually */
        ret = set_audio_clock_heirachy(smdk_snd_spdif_device);
        if (ret)
-               goto err1;
+               goto err4;
 
        return 0;
-err1:
+err4:
+       platform_device_del(smdk_snd_spdif_device);
+err3:
        platform_device_put(smdk_snd_spdif_device);
 err2:
+       platform_device_del(smdk_snd_spdif_dit_device);
+err1:
        platform_device_put(smdk_snd_spdif_dit_device);
        return ret;
 }
@@ -213,6 +217,7 @@ err2:
 static void __exit smdk_exit(void)
 {
        platform_device_unregister(smdk_snd_spdif_device);
+       platform_device_unregister(smdk_snd_spdif_dit_device);
 }
 
 module_init(smdk_init);