summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-07-24 01:34:35 +0300
committerMark Brown <broonie@kernel.org>2023-07-24 01:34:35 +0300
commit447281e71527080244ed1fa07e84a9d4e0654616 (patch)
tree58f57b177501db3a12da06cbe34a3a3ee412e97e /drivers/regulator
parent79232ec0ee0dfd11f0070a63d9307480ac39f87d (diff)
parent6eaae198076080886b9e7d57f4ae06fa782f90ef (diff)
downloadlinux-447281e71527080244ed1fa07e84a9d4e0654616.tar.xz
regulator: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/da9063-regulator.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index c5dd77be558b..dfd5ec9f75c9 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -778,6 +778,9 @@ static int da9063_check_xvp_constraints(struct regulator_config *config)
const struct notification_limit *uv_l = &constr->under_voltage_limits;
const struct notification_limit *ov_l = &constr->over_voltage_limits;
+ if (!config->init_data) /* No config in DT, pointers will be invalid */
+ return 0;
+
/* make sure that only one severity is used to clarify if unchanged, enabled or disabled */
if ((!!uv_l->prot + !!uv_l->err + !!uv_l->warn) > 1) {
dev_err(config->dev, "%s: at most one voltage monitoring severity allowed!\n",