Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp839313pxb; Wed, 13 Jan 2021 17:58:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyazwgtN5vCu02jfQMwqgyCmLD9ZhwROoHqsXb88fAu4Q2SBc4wpCdbqFzTURR8bDuq2JjN X-Received: by 2002:a17:906:af99:: with SMTP id mj25mr3717411ejb.414.1610589530843; Wed, 13 Jan 2021 17:58:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610589530; cv=none; d=google.com; s=arc-20160816; b=h3e1xfQXA8t+CSV1i3DLQV8e4rysSqmIkyGUc/bug/Mbnae0Yz1ttjU2HiRJBOS3DF VPSogtiVSS0ja1MQorIbi0Zj62fw60HcfYKveUcg6qlxcZm9ifbuowRYX7ZJkB3jyD3p PCMD0SJRA/0loJ26Mmu1e7X3UfttiK139+1bD5etzzYQiAlvqKXJrEXWXak5yv/tVHps tDdI2TLZ/q0DEtI+hiun6hw5zgsReOwZD7Z94RbWnQlbvW7hvSvmt3FdJElGEErn5c9Q HY9Li1rsS/WO5jBYgRRXZ99DG6Pv8zDeCWqlNP2Q1GIfdZsMzltYU8rkBP+JimNl8qq4 SaoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=/Zlmr8Iad4qwtDW5CFTi5k84Y25UAYrbaevAVuzfJqI=; b=okJBurtZxSgnrkkNdN+uJNnuZUatc+gbvZEba/A4ApWnLvKXN1bvKOEIDBNFaa5GAA zgal6/dvSOORlN3XBHdR7DWiAWxck5tmEfUgY/MT6CPDfqOV+ao80/EUW4J5XpTHJ1wN IT21JQo1KV/hGQib14ufwWs5Kq5Nz4MiL8nDQSz9EDOXmQDxovXUfbdcEYIxNKPyOK6O 8W1ahKcxJjfrEOvmxgnKvCFbYgng0+8pLH+x5GxVQxrsxkRCu78Ph/4i/6a2IUBCzzhX g2oU94K5FumTzBI7D+6hjRRHAvEQX8UnaapF7SCWnGz9lOBL/ph6H43T2Ve64GHwIH6o qRgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="e+Mh/pxP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h12si1928494ejx.467.2021.01.13.17.58.27; Wed, 13 Jan 2021 17:58:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="e+Mh/pxP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728401AbhANB5h (ORCPT + 99 others); Wed, 13 Jan 2021 20:57:37 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:39172 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729575AbhAMXn3 (ORCPT ); Wed, 13 Jan 2021 18:43:29 -0500 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 10DMsMQN093342; Wed, 13 Jan 2021 16:54:22 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1610578462; bh=/Zlmr8Iad4qwtDW5CFTi5k84Y25UAYrbaevAVuzfJqI=; h=From:To:CC:Subject:Date; b=e+Mh/pxPLXzs3fpPzvpw8wl3JP26qlk5xGjDhmzuSm3rO2j8kzmyQNGdACH9gx0Ug nrxFvrQrvTX9enhUg+zifxoqk4CKSRHOc1WmXehV9QUH+Rz31YB7fi7Qhqo3jF+oZj NvNMo+U3HQQEAAsHNuvUYfQ0MDHO+1NqwUNEOqi4= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 10DMsMeA004637 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 13 Jan 2021 16:54:22 -0600 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 13 Jan 2021 16:54:21 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 13 Jan 2021 16:54:21 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 10DMsLDl042146; Wed, 13 Jan 2021 16:54:21 -0600 From: Ricardo Rivera-Matos To: , , CC: , Ricardo Rivera-Matos Subject: [PATCH] power: supply: bq256xx: Fix BQ256XX_NUM_WD_VAL and bq256xx_watchdog_time[] overrun Date: Wed, 13 Jan 2021 16:53:52 -0600 Message-ID: <20210113225352.13099-1-r-rivera-matos@ti.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 32e4978bb92 ("power: supply: bq256xx: Introduce the BQ256XX charger driver") Reported-by: Dan Carpenter Signed-off-by: Ricardo Rivera-Matos --- drivers/power/supply/bq256xx_charger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/bq256xx_charger.c b/drivers/power/supply/bq256xx_charger.c index dc74c44618af..8414472083a6 100644 --- a/drivers/power/supply/bq256xx_charger.c +++ b/drivers/power/supply/bq256xx_charger.c @@ -135,7 +135,7 @@ #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; -- 2.30.0