Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09de9533 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: phycore-ac97: fix resource leak 



Fix imx_phycore_init() error path and imx_phycore_exit() to properly free
allocated resources.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ac8f924a

sound/soc/imx/phycore-ac97.c

+21 −7
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static struct snd_soc_card imx_phycore = { 
	.num_links	= ARRAY_SIZE(imx_phycore_dai_ac97),

};



static struct platform_device *imx_phycore_snd_ac97_device;

static struct platform_device *imx_phycore_snd_device;



static int __init imx_phycore_init(void)
@@ -53,29 +54,42 @@ static int __init imx_phycore_init(void) 
		/* return happy. We might run on a totally different machine */

		return 0;



	imx_phycore_snd_device = platform_device_alloc("soc-audio", -1);

	if (!imx_phycore_snd_device)

	imx_phycore_snd_ac97_device = platform_device_alloc("soc-audio", -1);

	if (!imx_phycore_snd_ac97_device)

		return -ENOMEM;



	platform_set_drvdata(imx_phycore_snd_device, &imx_phycore);

	ret = platform_device_add(imx_phycore_snd_device);

	platform_set_drvdata(imx_phycore_snd_ac97_device, &imx_phycore);

	ret = platform_device_add(imx_phycore_snd_ac97_device);

	if (ret)

		goto fail1;



	imx_phycore_snd_device = platform_device_alloc("wm9712-codec", -1);

	if (!imx_phycore_snd_device)

		return -ENOMEM;

	if (!imx_phycore_snd_device) {

		ret = -ENOMEM;

		goto fail2;

	}

	ret = platform_device_add(imx_phycore_snd_device);



	if (ret) {

		printk(KERN_ERR "ASoC: Platform device allocation failed\n");

		platform_device_put(imx_phycore_snd_device);

		goto fail3;

	}



	return 0;



fail3:

	platform_device_put(imx_phycore_snd_device);

fail2:

	platform_device_del(imx_phycore_snd_ac97_device);

fail1:

	platform_device_put(imx_phycore_snd_ac97_device);

	return ret;

}



static void __exit imx_phycore_exit(void)

{

	platform_device_unregister(imx_phycore_snd_device);

	platform_device_unregister(imx_phycore_snd_ac97_device);

}



late_initcall(imx_phycore_init);