Re: [PATCH 7/8] ASoC: imx-ssi: fix resource leak

[Sascha Hauer]

On Thu, Nov 25, 2010 at 03:13:09PM +0800, Axel Lin wrote:
> Fix imx_ssi_probe() error path and imx_ssi_remove() to properly free
> allocated resources.
> 
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>

Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

> ---
>  sound/soc/imx/imx-ssi.c |   15 +++++++++++----
>  1 files changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
> index ad21f81..30894ea 100644
> --- a/sound/soc/imx/imx-ssi.c
> +++ b/sound/soc/imx/imx-ssi.c
> @@ -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);
>  
> -- 
> 1.7.2
> 
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/