Skip to contentSkip to conversation

regulator: max77620: Fix regulator info setting for max20024

PATCH RESEND In review Axel Lin 3 participants 5 messages Apr 22, 2019 – Apr 25, 2019 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH RESEND 1/1 regulator: max77620: Fix regulator info setting for max20024

Current code always set pmic->rinfo[id] = &max77620_regs_info[id]; It should set to either max77620_regs_info or max20024_regs_info depends on the chip_id.

---
This was sent on https://lkml.org/lkml/2019/2/23/482

 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max77620-regulator.c +1 -1
index 1607ac673e44..0ad91a7f9cb9 100644
@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)
 			continue;
 
 		rdesc = &rinfo[id].desc;
-		pmic->rinfo[id] = &max77620_regs_info[id];
+		pmic->rinfo[id] = &rinfo[id];
 		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
 		pmic->reg_pdata[id].active_fps_src = -1;
 		pmic->reg_pdata[id].active_fps_pd_slot = -1;
Signature · 1 line
2.17.1
Reviewed-by Tested-by on v1 1/1
#1 lore raw

22.04.2019 8:35, Axel Lin пишет:

Quoted 17 lines

Current code always set pmic->rinfo[id] = &max77620_regs_info[id]; It should set to either max77620_regs_info or max20024_regs_info depends on the chip_id.

---
This was sent on https://lkml.org/lkml/2019/2/23/482

 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max77620-regulator.c +0 -0
index 1607ac673e44..0ad91a7f9cb9 100644

drivers/regulator/max77620-regulator.c static int max77620_regulator_probe(struct platform_device *pdev) · line 809

Quoted 8 lines
drivers/regulator/max77620-regulator.c +1 -1
@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)
 			continue;
 
 		rdesc = &rinfo[id].desc;
-		pmic->rinfo[id] = &max77620_regs_info[id];
+		pmic->rinfo[id] = &rinfo[id];
 		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
 		pmic->reg_pdata[id].active_fps_src = -1;
 		pmic->reg_pdata[id].active_fps_pd_slot = -1;

That is a quite difficult bug to spot because the regulator parameters are mostly identical and the part that differs is usually unused in practice, good catch! Thank you very much!

#2 lore raw

22.04.2019 14:39, Dmitry Osipenko пишет:

Quoted 29 lines

22.04.2019 8:35, Axel Lin пишет:

Quoted 17 lines

Current code always set pmic->rinfo[id] = &max77620_regs_info[id]; It should set to either max77620_regs_info or max20024_regs_info depends on the chip_id.

---
This was sent on https://lkml.org/lkml/2019/2/23/482

 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max77620-regulator.c +0 -0
index 1607ac673e44..0ad91a7f9cb9 100644

drivers/regulator/max77620-regulator.c static int max77620_regulator_probe(struct platform_device *pdev) · line 809

Quoted 8 lines
drivers/regulator/max77620-regulator.c +1 -1
@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)
 			continue;
 
 		rdesc = &rinfo[id].desc;
-		pmic->rinfo[id] = &max77620_regs_info[id];
+		pmic->rinfo[id] = &rinfo[id];
 		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
 		pmic->reg_pdata[id].active_fps_src = -1;
 		pmic->reg_pdata[id].active_fps_pd_slot = -1;

That is a quite difficult bug to spot because the regulator parameters are mostly identical and the part that differs is usually unused in practice, good catch! Thank you very much!

Quoted 3 lines

Axel, please also add a stable tag to the commit message to get the fix backported.

Cc stable <[email protected]>
maintainer
#3 lore raw

Applied "regulator: max77620: Fix regulator info setting for max20024" to the regulator tree

In reply to Axel Lin

The patch

regulator: max77620: Fix regulator info setting for max20024

has been applied to the regulator tree at

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

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 734008e714d8c757613c43ff57c1bf7ef1bb5b5d Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Mon, 22 Apr 2019 13:35:31 +0800
Subject: [PATCH] regulator: max77620: Fix regulator info setting for max20024

Current code always set pmic->rinfo[id] = &max77620_regs_info[id]; It should set to either max77620_regs_info or max20024_regs_info depends on the chip_id.

---
 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max77620-regulator.c +1 -1
index 1607ac673e44..0ad91a7f9cb9 100644
@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)
 			continue;
 
 		rdesc = &rinfo[id].desc;
-		pmic->rinfo[id] = &max77620_regs_info[id];
+		pmic->rinfo[id] = &rinfo[id];
 		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
 		pmic->reg_pdata[id].active_fps_src = -1;
 		pmic->reg_pdata[id].active_fps_pd_slot = -1;
Signature · 1 line
2.20.1
maintainer
#4 lore raw

Applied "regulator: max77620: Fix regulator info setting for max20024" to the regulator tree

In reply to Axel Lin

The patch

regulator: max77620: Fix regulator info setting for max20024

has been applied to the regulator tree at

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

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 734008e714d8c757613c43ff57c1bf7ef1bb5b5d Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Mon, 22 Apr 2019 13:35:31 +0800
Subject: [PATCH] regulator: max77620: Fix regulator info setting for max20024

Current code always set pmic->rinfo[id] = &max77620_regs_info[id]; It should set to either max77620_regs_info or max20024_regs_info depends on the chip_id.

---
 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max77620-regulator.c +1 -1
index 1607ac673e44..0ad91a7f9cb9 100644
@@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)
 			continue;
 
 		rdesc = &rinfo[id].desc;
-		pmic->rinfo[id] = &max77620_regs_info[id];
+		pmic->rinfo[id] = &rinfo[id];
 		pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
 		pmic->reg_pdata[id].active_fps_src = -1;
 		pmic->reg_pdata[id].active_fps_pd_slot = -1;
Signature · 1 line
2.20.1