summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-11-26 13:19:19 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 12:29:21 +0100
commit4b864af1a370103148e34044670cd9913de5c1be (patch)
treeed51d565ff600bb6f56385f21a974b0d1b6abac4
parentregulator: export of_get_regulator_init_data (diff)
downloadlinux-4b864af1a370103148e34044670cd9913de5c1be.tar.xz
linux-4b864af1a370103148e34044670cd9913de5c1be.zip
regulator: Checking return value of of_get_regulator_init_data
of_get_regulator_init_data() may return NULL, thus check the return value to avoid NULL pointer dereference. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/fixed.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index db90919f99c2..2997f11af905 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -64,6 +64,9 @@ struct fixed_voltage_config *of_get_fixed_voltage_config(struct device *dev)
return NULL;
config->init_data = of_get_regulator_init_data(dev);
+ if (!config->init_data)
+ return NULL;
+
init_data = config->init_data;
config->supply_name = init_data->constraints.name;