diff mbox series

[5.4,23/34] power: supply: core: Break capacity loop

Message ID	20220110071816.436348315@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Chunyan Zhang <chunyan.zhang@unisoc.com>, Baolin Wang <baolin.wang@linux.alibaba.com>, Linus Walleij <linus.walleij@linaro.org>, Sebastian Reichel <sebastian.reichel@collabora.com> Subject: [PATCH 5.4 23/34] power: supply: core: Break capacity loop Date: Mon, 10 Jan 2022 08:23:18 +0100 Message-Id: <20220110071816.436348315@linuxfoundation.org> In-Reply-To: <20220110071815.647309738@linuxfoundation.org> References: <20220110071815.647309738@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/34] Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40 [5.4,03/34] selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv() [5.4,07/34] iavf: Fix limit of total number of queues to active queues of VF [5.4,09/34] RDMA/uverbs: Check for null return of kmalloc_array [5.4,11/34] i40e: fix use-after-free in i40e_sync_filters_subtask() [5.4,12/34] i40e: Fix for displaying message regarding NVM version [5.4,13/34] i40e: Fix incorrect netdevs real number of RX/TX queues [5.4,14/34] ipv4: Check attribute length for RTA_GATEWAY in multipath route [5.4,16/34] ipv6: Check attribute length for RTA_GATEWAY in multipath route [5.4,20/34] sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc [5.4,22/34] xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate [5.4,23/34] power: supply: core: Break capacity loop [5.4,24/34] power: reset: ltc2952: Fix use of floating point literals [5.4,26/34] phonet: refcount leak in pep_sock_accep [5.4,27/34] ipv6: Continue processing multipath route even if gateway attribute is invalid [5.4,28/34] ipv6: Do cleanup if attribute validation fails in multipath route [5.4,29/34] usb: mtu3: fix interval value for intr and isoc [5.4,31/34] ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate [5.4,33/34] atlantic: Fix buff_ring OOB in aq_ring_rx_clean

Commit Message

Greg KH Jan. 10, 2022, 7:23 a.m. UTC

From: Linus Walleij <linus.walleij@linaro.org>

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 |    4 ++++
 1 file changed, 4 insertions(+)

diff mbox series

Patch

--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -742,6 +742,10 @@  power_supply_find_ocv2cap_table(struct p
 		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) {