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

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

ASoC: imx-ssi: fix resource leak 



Fix imx_ssi_probe() error path and imx_ssi_remove() 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 14abca3d

sound/soc/imx/imx-ssi.c

+11 −4
Original line number Diff line number Diff line
@@ -679,8 +679,11 @@ static int imx_ssi_probe(struct platform_device *pdev) 
	}



	ssi->soc_platform_pdev_fiq = platform_device_alloc("imx-fiq-pcm-audio", pdev->id);

	if (!ssi->soc_platform_pdev_fiq)

	if (!ssi->soc_platform_pdev_fiq) {

		ret = -ENOMEM;

		goto failed_pdev_fiq_alloc;

	}



	platform_set_drvdata(ssi->soc_platform_pdev_fiq, ssi);

	ret = platform_device_add(ssi->soc_platform_pdev_fiq);

	if (ret) {
@@ -689,8 +692,11 @@ static int imx_ssi_probe(struct platform_device *pdev) 
	}



	ssi->soc_platform_pdev = platform_device_alloc("imx-pcm-audio", pdev->id);

	if (!ssi->soc_platform_pdev)

	if (!ssi->soc_platform_pdev) {

		ret = -ENOMEM;

		goto failed_pdev_alloc;

	}



	platform_set_drvdata(ssi->soc_platform_pdev, ssi);

	ret = platform_device_add(ssi->soc_platform_pdev);

	if (ret) {
@@ -703,6 +709,7 @@ static int imx_ssi_probe(struct platform_device *pdev) 
failed_pdev_add:

	platform_device_put(ssi->soc_platform_pdev);

failed_pdev_alloc:

	platform_device_del(ssi->soc_platform_pdev_fiq);

failed_pdev_fiq_add:

	platform_device_put(ssi->soc_platform_pdev_fiq);

failed_pdev_fiq_alloc:
@@ -726,8 +733,8 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev) 
	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	struct imx_ssi *ssi = platform_get_drvdata(pdev);



	platform_device_del(ssi->soc_platform_pdev);

	platform_device_put(ssi->soc_platform_pdev);

	platform_device_unregister(ssi->soc_platform_pdev);

	platform_device_unregister(ssi->soc_platform_pdev_fiq);



	snd_soc_unregister_dai(&pdev->dev);