power: supply: ltc3651-charger: fix some error codes in probe (e1285417) · Commits · 戴 / test

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: ("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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message