]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
power: supply: ltc3651-charger: fix some error codes in probe
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 18 May 2017 07:43:46 +0000 (10:43 +0300)
committerSebastian Reichel <sre@kernel.org>
Thu, 8 Jun 2017 11:05:27 +0000 (13:05 +0200)
There are several cut and past bugs here.  ltc3651_charger->charger is
NULL at this point, so we return success instead of the intended error
codes.

Fixes: c94d4ed017ae ("power: supply: Add ltc3651-charger driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[Wei Yongjun found the same issue independently]
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/supply/ltc3651-charger.c

index 5f8d5c0b5721aaee92fc4288059a1b98e38d8204..eea63ff211c4b69618bd9b68c60c3ace57c1f21c 100644 (file)
@@ -110,21 +110,21 @@ static int ltc3651_charger_probe(struct platform_device *pdev)
        ltc3651_charger->acpr_gpio = devm_gpiod_get(&pdev->dev,
                                        "lltc,acpr", GPIOD_IN);
        if (IS_ERR(ltc3651_charger->acpr_gpio)) {
-               ret = PTR_ERR(ltc3651_charger->charger);
+               ret = PTR_ERR(ltc3651_charger->acpr_gpio);
                dev_err(&pdev->dev, "Failed to acquire acpr GPIO: %d\n", ret);
                return ret;
        }
        ltc3651_charger->fault_gpio = devm_gpiod_get_optional(&pdev->dev,
                                        "lltc,fault", GPIOD_IN);
        if (IS_ERR(ltc3651_charger->fault_gpio)) {
-               ret = PTR_ERR(ltc3651_charger->charger);
+               ret = PTR_ERR(ltc3651_charger->fault_gpio);
                dev_err(&pdev->dev, "Failed to acquire fault GPIO: %d\n", ret);
                return ret;
        }
        ltc3651_charger->chrg_gpio = devm_gpiod_get_optional(&pdev->dev,
                                        "lltc,chrg", GPIOD_IN);
        if (IS_ERR(ltc3651_charger->chrg_gpio)) {
-               ret = PTR_ERR(ltc3651_charger->charger);
+               ret = PTR_ERR(ltc3651_charger->chrg_gpio);
                dev_err(&pdev->dev, "Failed to acquire chrg GPIO: %d\n", ret);
                return ret;
        }