Re: [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs error path

[Mike Rapoport]

Axel Lin wrote:
> 1. return -ENOMEM if platform_device_alloc() fail.
> 2. call platform_device_put() if platform_device_add() fail.
>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>

Acked-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>

> ---
>  drivers/mfd/tps6586x.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index 4cde31e..1c91936 100644
> --- a/drivers/mfd/tps6586x.c
> +++ b/drivers/mfd/tps6586x.c
> @@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
>  		subdev = &pdata->subdevs[i];
>  
>  		pdev = platform_device_alloc(subdev->name, subdev->id);
> +		if (!pdev) {
> +			ret = -ENOMEM;
> +			goto failed;
> +		}
>  
>  		pdev->dev.parent = tps6586x->dev;
>  		pdev->dev.platform_data = subdev->platform_data;
>  
>  		ret = platform_device_add(pdev);
> -		if (ret)
> +		if (ret) {
> +			platform_device_put(pdev);
>  			goto failed;
> +		}
>  	}
>  	return 0;
>  


--
Sincerely yours,
Mike.
--
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/