]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mfd: max77843: Fix max77843_chg_init() return on error
authorJavier Martinez Canillas <javier@osg.samsung.com>
Mon, 21 Sep 2015 12:26:54 +0000 (14:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Oct 2015 00:53:38 +0000 (09:53 +0900)
commit 1b52e50f2a402a266f1ba2281f0a57e87637a047 upstream.

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.

Fixes: c7f585fe46d8 ("mfd: max77843: Add max77843 MFD driver core driver")
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mfd/max77843.c

index a354ac677ec7027fa427ce40dd034899b4204866..1074a0d68680a7be149c20af7f53800dad750776 100644 (file)
@@ -79,7 +79,7 @@ static int max77843_chg_init(struct max77843 *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);