power: supply: bq256xx: Fix BQ256XX_NUM_WD_VAL and bq256xx_watchdog_time[] overrun
authorRicardo Rivera-Matos <r-rivera-matos@ti.com>
Wed, 13 Jan 2021 22:53:52 +0000 (16:53 -0600)
committerSebastian Reichel <sre@kernel.org>
Thu, 14 Jan 2021 22:38:56 +0000 (23:38 +0100)
Corrects BQ256XX_NUM_WD_VAL from value of "8" to "4" and fixes the issue when 'i'
is equal to array size then array index over runs the array

Fixes: 32e4978bb920 ("power: supply: bq256xx: Introduce the BQ256XX charger driver")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ricardo Rivera-Matos <r-rivera-matos@ti.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/bq256xx_charger.c

index 6d1c524743d42f1d6fa4e07100840cfe5f29e175..2ab5ba4af92bff153b5b5637edc668048c936979 100644 (file)
 #define BQ256XX_NTC_FAULT_COLD         (BIT(2) | BIT(0))
 #define BQ256XX_NTC_FAULT_HOT          (BIT(2) | BIT(1))
 
-#define BQ256XX_NUM_WD_VAL     8
+#define BQ256XX_NUM_WD_VAL     4
 #define BQ256XX_WATCHDOG_MASK  GENMASK(5, 4)
 #define BQ256XX_WATCHDOG_MAX   1600000
 #define BQ256XX_WATCHDOG_DIS   0
@@ -1508,6 +1508,10 @@ static int bq256xx_hw_init(struct bq256xx_device *bq)
        int i;
 
        for (i = 0; i < BQ256XX_NUM_WD_VAL; i++) {
+               if (bq->watchdog_timer == bq256xx_watchdog_time[i]) {
+                       wd_reg_val = i;
+                       break;
+               }
                if (bq->watchdog_timer > bq256xx_watchdog_time[i] &&
                    bq->watchdog_timer < bq256xx_watchdog_time[i + 1])
                        wd_reg_val = i;