From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 14 Dec 2016 16:38:50 +0000 (+0100)
Subject: power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error
X-Git-Tag: C0P2-H0.0--20200415~7325
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=36c56ac0f8977ac189d27a7aa401ea9dca678c5d;p=linux.git

power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error


[ Upstream commit 6f074bc878dc9b00c0df0bf3a8cb1d9e294cd881 ]

If reading the register fails, return the actual error code, instead
of the uninitialized val variable;

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
index 5bdde692f724..f62f9dfea984 100644
--- a/drivers/power/supply/axp288_fuel_gauge.c
+++ b/drivers/power/supply/axp288_fuel_gauge.c
@@ -169,8 +169,10 @@ static int fuel_gauge_reg_readb(struct axp288_fg_info *info, int reg)
 			break;
 	}
 
-	if (ret < 0)
+	if (ret < 0) {
 		dev_err(&info->pdev->dev, "axp288 reg read err:%d\n", ret);
+		return ret;
+	}
 
 	return val;
 }