aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/qcom_spmi-regulator.c
diff options
context:
space:
mode:
authorJeffrey Hugo <jeffrey.l.hugo@gmail.com>2019-06-20 07:22:28 -0700
committerMark Brown <broonie@kernel.org>2019-06-24 17:26:15 +0100
commitb01d18232587881ae813d4a1d14c8d9a2ac36b15 (patch)
tree5280a69229a5ceffcbdf43e5463512051344945a /drivers/regulator/qcom_spmi-regulator.c
parentregulator: qcom_spmi: Fix math of spmi_regulator_set_voltage_time_sel (diff)
downloadlinux-dev-b01d18232587881ae813d4a1d14c8d9a2ac36b15.tar.xz
linux-dev-b01d18232587881ae813d4a1d14c8d9a2ac36b15.zip
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") Reported-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/qcom_spmi-regulator.c')
-rw-r--r--drivers/regulator/qcom_spmi-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
index 877df33e0246..7f51c5fc8194 100644
--- a/drivers/regulator/qcom_spmi-regulator.c
+++ b/drivers/regulator/qcom_spmi-regulator.c
@@ -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;