Re: [PATCH] wm8994-core: fix wm8994_device_init() return value

[Samuel Ortiz]

Hi Axel,

On Wed, Aug 04, 2010 at 09:44:47AM +0800, Axel Lin wrote:
> wm8994_device_init() will return 0 in the case of kzalloc fail
> in current implementation.
> This patch fixes the return value.
Patch applied, thanks a lot.

Cheers,
Samuel.

 
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
> ---
>  drivers/mfd/wm8994-core.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
> index ec71c93..69533f5 100644
> --- a/drivers/mfd/wm8994-core.c
> +++ b/drivers/mfd/wm8994-core.c
> @@ -326,8 +326,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq)
>  	wm8994->supplies = kzalloc(sizeof(struct regulator_bulk_data) *
>  				   ARRAY_SIZE(wm8994_main_supplies),
>  				   GFP_KERNEL);
> -	if (!wm8994->supplies)
> +	if (!wm8994->supplies) {
> +		ret = -ENOMEM;
>  		goto err;
> +	}
>  
>  	for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++)
>  		wm8994->supplies[i].supply = wm8994_main_supplies[i];
> -- 
> 1.5.4.3
> 
> 
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
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/