Skip to contentSkip to conversation

regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer

PATCH In review Axel Lin 3 participants 3 messages May 16, 2019 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer

A NULL init_data once incremented will lead to oops, fix it.

Fixes f979c08f7624 ("regulator: tps6507x: Convert to regulator core's simplified DT parsing code")

---
Hi Sekhar,
Please check if this patch works, thanks.
Axel

 drivers/regulator/tps6507x-regulator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/tps6507x-regulator.c +3 -3
index a1b7fab91dd4..d2a8f69b2665 100644
@@ -403,12 +403,12 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
 	/* common for all regulators */
 	tps->mfd = tps6507x_dev;
 
-	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
+	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++) {
 		/* Register the regulators */
 		tps->info[i] = info;
-		if (init_data && init_data->driver_data) {
+		if (init_data && init_data[i].driver_data) {
 			struct tps6507x_reg_platform_data *data =
-					init_data->driver_data;
+					init_data[i].driver_data;
 			info->defdcdc_default = data->defdcdc_default;
 		}
 
Signature · 1 line
2.20.1
Tested-by on v1 1/1
#1 lore raw
Quoted 9 lines · Axel Lin

A NULL init_data once incremented will lead to oops, fix it.

Fixes f979c08f7624 ("regulator: tps6507x: Convert to regulator core's simplified DT parsing code")

---
Hi Sekhar,
Please check if this patch works, thanks.
Axel

Boot is fine now and PMIC regulator rail microvolts readings from sysfs are correct as well. I did not try to change the voltages though.

Thanks,
Sekhar

maintainer
#2 lore raw

Applied "regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer" to the regulator tree

In reply to Axel Lin

The patch

regulator: tps6507x: Fix boot regression due to testing wrong init_data pointer

has been applied to the regulator tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.2

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From 7d293f56456120efa97c4e18250d86d2a05ad0bd Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Thu, 16 May 2019 20:48:08 +0800
Subject: [PATCH] regulator: tps6507x: Fix boot regression due to testing wrong
init_data pointer

A NULL init_data once incremented will lead to oops, fix it.

Fixes f979c08f7624 ("regulator: tps6507x: Convert to regulator core's simplified DT parsing code")
---
 drivers/regulator/tps6507x-regulator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/tps6507x-regulator.c +3 -3
index a1b7fab91dd4..d2a8f69b2665 100644
@@ -403,12 +403,12 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
 	/* common for all regulators */
 	tps->mfd = tps6507x_dev;
 
-	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++, init_data++) {
+	for (i = 0; i < TPS6507X_NUM_REGULATOR; i++, info++) {
 		/* Register the regulators */
 		tps->info[i] = info;
-		if (init_data && init_data->driver_data) {
+		if (init_data && init_data[i].driver_data) {
 			struct tps6507x_reg_platform_data *data =
-					init_data->driver_data;
+					init_data[i].driver_data;
 			info->defdcdc_default = data->defdcdc_default;
 		}
 
Signature · 1 line
2.20.1