diff options
| author | Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> | 2021-09-14 14:18:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-17 09:48:24 +0100 |
| commit | 11129762e31a91ff003c92e8170d7573bb529e9c (patch) | |
| tree | cd2bcf6cdbae6a6b0837ba2a3e685d1a56bc23d2 /drivers/power | |
| parent | 625c3ed247e15bfe9e26294cbcf810f6a84d3812 (diff) | |
| download | linux-11129762e31a91ff003c92e8170d7573bb529e9c.tar.gz linux-11129762e31a91ff003c92e8170d7573bb529e9c.tar.bz2 linux-11129762e31a91ff003c92e8170d7573bb529e9c.zip | |
power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
commit e660dbb68c6b3f7b9eb8b9775846a44f9798b719 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/power')
| -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 f8f8207a1895..8fe67490366d 100644 --- a/drivers/power/supply/max17042_battery.c +++ b/drivers/power/supply/max17042_battery.c @@ -834,7 +834,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); } |