[PATCH RESEND] regulator: max77620: Fix regulator info setting for max20024

[PATCH RESEND] regulator: max77620: Fix regulator info setting for max20024

[Axel Lin]

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.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
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(-)

diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 1607ac673e44..0ad91a7f9cb9 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -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;
-- 
2.17.1

Re: [PATCH RESEND] regulator: max77620: Fix regulator info setting for max20024

[Dmitry Osipenko]

22.04.2019 8:35, Axel Lin пишет:
> 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.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> 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(-)
> 
> diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
> index 1607ac673e44..0ad91a7f9cb9 100644
> --- a/drivers/regulator/max77620-regulator.c
> +++ b/drivers/regulator/max77620-regulator.c
> @@ -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!

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>

Re: [PATCH RESEND] regulator: max77620: Fix regulator info setting for max20024

[Dmitry Osipenko]

22.04.2019 14:39, Dmitry Osipenko пишет:
> 22.04.2019 8:35, Axel Lin пишет:
>> 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.
>>
>> Signed-off-by: Axel Lin <axel.lin@ingics.com>
>> ---
>> 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(-)
>>
>> diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
>> index 1607ac673e44..0ad91a7f9cb9 100644
>> --- a/drivers/regulator/max77620-regulator.c
>> +++ b/drivers/regulator/max77620-regulator.c
>> @@ -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!
> 
> Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
> Tested-by: Dmitry Osipenko <digetx@gmail.com>
> 

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

Cc: stable <stable@vger.kernel.org>

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

[Mark Brown]

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 <axel.lin@ingics.com>
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.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 1607ac673e44..0ad91a7f9cb9 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -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;
-- 
2.20.1

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

[Mark Brown]

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 <axel.lin@ingics.com>
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.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/max77620-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 1607ac673e44..0ad91a7f9cb9 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -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;
-- 
2.20.1