Re: [PATCH RESEND] twl4030_charger: fix charging current out-of-bounds
From: Sebastian Reichel <hidden>
Date: 2018-09-20 00:20:58
Also in:
linux-omap, lkml
Hi, On Mon, Sep 17, 2018 at 07:20:35AM +0200, Andreas Kemnade wrote:
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> ---
Thanks, queued. -- Sebastian
quoted hunk ↗ jump to hunk
drivers/power/supply/twl4030_charger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index b72838663872..c954b7234393 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c@@ -421,7 +421,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) {-- 2.11.0
Attachments
- signature.asc [application/pgp-signature] 833 bytes