[PATCH] power: supply: core: Break capacity loop

[PATCH] power: supply: core: Break capacity loop

[Linus Walleij]

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>
---
 drivers/power/supply/power_supply_core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 038e35ea7fbe..885c92dc0379 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -852,6 +852,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) {
-- 
2.31.1

Re: [PATCH] power: supply: core: Break capacity loop

[Baolin Wang]

On 2021/11/15 7:12, Linus Walleij wrote:
> 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>

LGTM.
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>

> ---
>   drivers/power/supply/power_supply_core.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 038e35ea7fbe..885c92dc0379 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -852,6 +852,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) {
> 

Re: [PATCH] power: supply: core: Break capacity loop

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

Hi,

On Mon, Nov 15, 2021 at 06:24:49PM +0800, Baolin Wang wrote:
> 
> 
> On 2021/11/15 7:12, Linus Walleij wrote:
> > 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>
> 
> LGTM.
> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>

Thanks, queued to fixes branch.

-- Sebastian

> > ---
> >   drivers/power/supply/power_supply_core.c | 4 ++++
> >   1 file changed, 4 insertions(+)
> > 
> > diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> > index 038e35ea7fbe..885c92dc0379 100644
> > --- a/drivers/power/supply/power_supply_core.c
> > +++ b/drivers/power/supply/power_supply_core.c
> > @@ -852,6 +852,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) {
> > 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]