Received-SPF: pass (google.com: domain of linux-kernel+bounces-199482-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Shree Ramamoorthy <s-ramamoorthy@ti.com>
To: <lgirdwood@gmail.com>, <linux-kernel@vger.kernel.org>
CC: <m-leonard@ti.com>, <u-kumar1@ti.com>, <n-francis@ti.com>,
        <bhargav.r@ltts.com>, <m.nirmaladevi@ltts.com>, <vigneshr@ti.com>,
        Shree
 Ramamoorthy <s-ramamoorthy@ti.com>
Subject: [PATCH v1 1/1] Correct nr_types assignment for TPS6594/3 and TPS65224
Date: Mon, 3 Jun 2024 12:05:24 -0500
Message-ID: <20240603170524.643010-2-s-ramamoorthy@ti.com>
In-Reply-To: <20240603170524.643010-1-s-ramamoorthy@ti.com>
References: <20240603170524.643010-1-s-ramamoorthy@ti.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

Swap nr_types assignment for TPS6594/3 and TPS65224.
Issue detected with v6.10-rc1 and tested using a TI J7200 EVM board.

Log:
[   13.974024] Call trace:
[   13.974025]  _regulator_put.part.0+0x40/0x48
[   13.974028]  regulator_register+0x2b0/0xa00
[   13.974031]  devm_regulator_register+0x58/0xa0
[   13.974035]  tps6594_regulator_probe+0x4e0/0x5f0 [tps6594_regulator]
...
[   13.974178] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000004

Signed-off-by: Shree Ramamoorthy <s-ramamoorthy@ti.com>
---
 drivers/regulator/tps6594-regulator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/tps6594-regulator.c b/drivers/regulator/tps6594-regulator.c
index 4a859f4c0f83..b66608ab2546 100644
--- a/drivers/regulator/tps6594-regulator.c
+++ b/drivers/regulator/tps6594-regulator.c
@@ -660,11 +660,11 @@ static int tps6594_regulator_probe(struct platform_device *pdev)
 	} else if (tps->chip_id == TPS65224) {
 		nr_buck = ARRAY_SIZE(tps65224_buck_regs);
 		nr_ldo = ARRAY_SIZE(tps65224_ldo_regs);
-		nr_types = REGS_INT_NB;
+		nr_types = TPS65224_REGS_INT_NB;
 	} else {
 		nr_buck = ARRAY_SIZE(buck_regs);
 		nr_ldo = ARRAY_SIZE(tps6594_ldo_regs);
-		nr_types = TPS65224_REGS_INT_NB;
+		nr_types = REGS_INT_NB;
 	}
 
 	reg_irq_nb = nr_types * (nr_buck + nr_ldo);
--