power: supply: core: Break capacity loop
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 14 Nov 2021 23:12:07 +0000 (00:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Jan 2022 14:35:16 +0000 (15:35 +0100)
commit 51c7b6a0398f54b9120795796a4cff4fc9634f7d upstream.

We should not go on looking for more capacity tables after
we realize we have looked at the last one in
power_supply_find_ocv2cap_table().

Fixes: 3afb50d7125b ("power: supply: core: Add some helpers to use the battery OCV capacity table")
Cc: Chunyan Zhang <chunyan.zhang@unisoc.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/power/supply/power_supply_core.c

index 0c2132c..a6e9afa 100644 (file)
@@ -853,6 +853,10 @@ power_supply_find_ocv2cap_table(struct power_supply_battery_info *info,
                return NULL;
 
        for (i = 0; i < POWER_SUPPLY_OCV_TEMP_MAX; i++) {
+               /* Out of capacity tables */
+               if (!info->ocv_table[i])
+                       break;
+
                temp_diff = abs(info->ocv_temp[i] - temp);
 
                if (temp_diff < best_temp_diff) {