Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path

[Eric Miao]

On Tue, Aug 24, 2010 at 1:44 PM, Axel Lin <axel.lin@xxxxxxxxx> wrote:
> This patch fixes da903x_add_subdevs error path:
> 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: Eric Miao <eric.y.miao@xxxxxxxxx>

> ---
> Âdrivers/mfd/da903x.c | Â Â8 +++++++-
> Â1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> index c07aece..2fadbae 100644
> --- a/drivers/mfd/da903x.c
> +++ b/drivers/mfd/da903x.c
> @@ -470,13 +470,19 @@ static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
> Â Â Â Â Â Â Â Âsubdev = &pdata->subdevs[i];
>
> Â Â Â Â Â Â Â Âpdev = platform_device_alloc(subdev->name, subdev->id);
> + Â Â Â Â Â Â Â if (!pdev) {
> + Â Â Â Â Â Â Â Â Â Â Â ret = -ENOMEM;
> + Â Â Â Â Â Â Â Â Â Â Â goto failed;
> + Â Â Â Â Â Â Â }
>
> Â Â Â Â Â Â Â Âpdev->dev.parent = chip->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;
>
> --
> 1.7.2
>
>
>
>
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðÃnÆàþY&—