power: supply: twl4030_charger: fix charging current out-of-bounds

BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit 8314c212f995bc0d06b54ad02ef0ab4089781540 ]

the charging current uses unsigned int variables, if we step back
if the current is still low, we would run into negative which
means setting the target to a huge value.
Better add checks here.

Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index b6a7d9f74cf30b0c1d1ab1a9f506206725690210..adcaa0a10a6f4b5d1dc17778dde025396edcdb8c 100644 (file)
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -420,7 +420,8 @@ static void twl4030_current_worker(struct work_struct *data)
 
        if (v < USB_MIN_VOLT) {
                /* Back up and stop adjusting. */
-               bci->usb_cur -= USB_CUR_STEP;
+               if (bci->usb_cur >= USB_CUR_STEP)
+                       bci->usb_cur -= USB_CUR_STEP;
                bci->usb_cur_target = bci->usb_cur;
        } else if (bci->usb_cur >= bci->usb_cur_target ||
                   bci->usb_cur + USB_CUR_STEP > USB_MAX_CURRENT) {