summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Mihalache <mihai.d.mihalache@intel.com>2016-03-16 08:21:12 -0700
committerMark Brown <broonie@kernel.org>2016-03-17 11:44:57 +0000
commit8d48794bb3bf7d7e421204a8cc3bd5c95ffc609b (patch)
tree1812e794803bddf1f70f9931193ae1560ff459b7
parent768e66686cfe83f786f6ae26f1799cca69e80523 (diff)
downloadlinux-8d48794bb3bf7d7e421204a8cc3bd5c95ffc609b.tar.gz
regulator: gpio: check return value of of_get_named_gpio
At boot time the regulator driver can be initialized before the gpio, in which case the call to of_get_named_gpio will return EPROBE_DEFER. This value is silently passed to regulator_register which will return success, although the gpio is not registered (regulator_ena_gpio_request not called) as the value passed is detected as invalid. The gpio_regulator_probe will therefore succeed win no gpio requested. Signed-off-by: Mihai Mihalache <mihai.d.mihalache@intel.com> Reviewed-by: Hans Holmberg <hans.holmberg@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/gpio-regulator.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index a8718e98674a..83e89e5d4752 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -162,6 +162,8 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
+ if (config->enable_gpio == -EPROBE_DEFER)
+ return ERR_PTR(-EPROBE_DEFER);
/* Fetch GPIOs. - optional property*/
ret = of_gpio_count(np);