36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
|
From 7a77d08f1f2e0671d5d62dc0ddc445af5b103d1b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
|
||
|
|
Date: Tue, 14 Sep 2021 14:18:06 +0200
|
||
|
|
Subject: [PATCH 10/10] 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>
|
||
|
|
---
|
||
|
|
drivers/power/supply/max17042_battery.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
|
||
|
|
index 7cfbca28e703..aaf6f1bd3d29 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);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|