Re: [RESEND PATCH] mfd: max77843: Fix max77843_chg_init() return on error

[Lee Jones]

On Mon, 21 Sep 2015, Javier Martinez Canillas wrote:

> If i2c_new_dummy() fails in max77843_chg_init(), an PTR_ERR(NULL) is
> returned which is 0. So the function was wrongly returning a success
> value instead of an error code.
> 
> Cc: stable@xxxxxxxxxxxxxxx # 4.1
> Fixes: c7f585fe46d8 ("mfd: max77843: Add max77843 MFD driver core driver")
> Signed-off-by: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
> 
> ---
> Changes in the RESEND:
> - Added Krzysztof's Reviewed-by tag.
> - Added a tag for stable.
> 
>  drivers/mfd/max77843.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

> diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
> index c52162ea3d0a..586098f1b233 100644
> --- a/drivers/mfd/max77843.c
> +++ b/drivers/mfd/max77843.c
> @@ -80,7 +80,7 @@ static int max77843_chg_init(struct max77693_dev *max77843)
>  	if (!max77843->i2c_chg) {
>  		dev_err(&max77843->i2c->dev,
>  				"Cannot allocate I2C device for Charger\n");
> -		return PTR_ERR(max77843->i2c_chg);
> +		return -ENODEV;
>  	}
>  	i2c_set_clientdata(max77843->i2c_chg, max77843);
>  

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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/