Skip to contentSkip to conversation

regulator: qcom_spmi: Do NULL check for lvs

PATCH In review Jeffrey Hugo 3 participants 3 messages Jun 20, 2019 – Jun 25, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: qcom_spmi: Do NULL check for lvs

Low-voltage switches (lvs) don't have set_points since the voltage ranges of the output are really controlled by the inputs. This is a problem for the newly added linear range support in the probe(), as that will cause a null pointer dereference error on older platforms like msm8974 which happen to need to control some of the implemented lvs.

Fix this by adding the appropriate null check.

Fixes 86f4ff7a0c0c ("regulator: qcom_spmi: enable linear range info")
---
 drivers/regulator/qcom_spmi-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/qcom_spmi-regulator.c +1 -1
index 877df33e0246..7f51c5fc8194 100644
@@ -2045,7 +2045,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
 			}
 		}
 
-		if (vreg->set_points->count == 1) {
+		if (vreg->set_points && vreg->set_points->count == 1) {
 			/* since there is only one range */
 			range = vreg->set_points->range;
 			vreg->desc.uV_step = range->step_uV;
Signature · 1 line
2.17.1
Tested-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jeffrey Hugo

Low-voltage switches (lvs) don't have set_points since the voltage ranges of the output are really controlled by the inputs. This is a problem for the newly added linear range support in the probe(), as that will cause a null pointer dereference error on older platforms like msm8974 which happen to need to control some of the implemented lvs.

Fix this by adding the appropriate null check.

Thanks Jeff, this resolves the regression I've seen the last couple of days on linux-next.

Regards,
Bjorn

Quoted 23 lines
Fixes 86f4ff7a0c0c ("regulator: qcom_spmi: enable linear range info")
---
 drivers/regulator/qcom_spmi-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/qcom_spmi-regulator.c +1 -1
index 877df33e0246..7f51c5fc8194 100644
@@ -2045,7 +2045,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
 			}
 		}
 
-		if (vreg->set_points->count == 1) {
+		if (vreg->set_points && vreg->set_points->count == 1) {
 			/* since there is only one range */
 			range = vreg->set_points->range;
 			vreg->desc.uV_step = range->step_uV;
Signature · 1 line
2.17.1
maintainer
#2 lore raw

Applied "regulator: qcom_spmi: Do NULL check for lvs" to the regulator tree

In reply to Jeffrey Hugo

The patch

regulator: qcom_spmi: Do NULL check for lvs

has been applied to the regulator tree at

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

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 b01d18232587881ae813d4a1d14c8d9a2ac36b15 Mon Sep 17 00:00:00 2001
From: Jeffrey Hugo <[email protected]>
Date: Thu, 20 Jun 2019 07:22:28 -0700
Subject: [PATCH] regulator: qcom_spmi: Do NULL check for lvs

Low-voltage switches (lvs) don't have set_points since the voltage ranges of the output are really controlled by the inputs. This is a problem for the newly added linear range support in the probe(), as that will cause a null pointer dereference error on older platforms like msm8974 which happen to need to control some of the implemented lvs.

Fix this by adding the appropriate null check.

Fixes 86f4ff7a0c0c ("regulator: qcom_spmi: enable linear range info")
---
 drivers/regulator/qcom_spmi-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/qcom_spmi-regulator.c +1 -1
index 877df33e0246..7f51c5fc8194 100644
@@ -2045,7 +2045,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
 			}
 		}
 
-		if (vreg->set_points->count == 1) {
+		if (vreg->set_points && vreg->set_points->count == 1) {
 			/* since there is only one range */
 			range = vreg->set_points->range;
 			vreg->desc.uV_step = range->step_uV;
Signature · 1 line
2.20.1