diff options
author | Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> | 2021-09-14 14:18:06 +0200 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2021-10-12 17:59:10 +0200 |
commit | e660dbb68c6b3f7b9eb8b9775846a44f9798b719 (patch) | |
tree | 2026a9de57bdd20ab1f563e91f31ce076ef50b75 | |
parent | 0cf48167b87e388fa1268c9fe6d2443ae7f43d8a (diff) | |
download | linux-stable-e660dbb68c6b3f7b9eb8b9775846a44f9798b719.tar.gz linux-stable-e660dbb68c6b3f7b9eb8b9775846a44f9798b719.tar.bz2 linux-stable-e660dbb68c6b3f7b9eb8b9775846a44f9798b719.zip |
power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
max17042_set_soc_threshold gets called with offset set to 1, which means
that minimum threshold value would underflow once SOC got down to 0,
causing invalid alerts from the gauge.
Fixes: e5f3872d2044 ("max17042: Add support for signalling change in SOC")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-rw-r--r-- | drivers/power/supply/max17042_battery.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c index 2eb61856f3e4..87128cf0d577 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -860,7 +860,8 @@ static void max17042_set_soc_threshold(struct max17042_chip *chip, u16 off) regmap_read(map, MAX17042_RepSOC, &soc); soc >>= 8; soc_tr = (soc + off) << 8; - soc_tr |= (soc - off); + if (off < soc) + soc_tr |= soc - off; regmap_write(map, MAX17042_SALRT_Th, soc_tr); } |