Skip to content

Commit 09f2ba0

Browse files
Jisheng Zhangbroonie
authored andcommitted
regulator: gpio: properly check return value of of_get_named_gpio
The function of_get_named_gpio() could return -ENOENT, -EPROBE_DEFER -EINVAL and so on. Currently, for the optional property "enable-gpio", we only check -EPROBE_DEFER, this is not enough since there may be misconfigured "enable-gpio" in the DTB, of_get_named_gpio() will return -EINVAL in this case, we should return immediately here. And for the optional property "gpios", we didn't check the return value, the driver will continue to the point where gpio_request_array() is called, it doesn't make sense to continue if we got -EPROBE_DEFER or -EINVAL here. This patch tries to address these two issues by properly checking the return value of of_get_named_gpio. Signed-off-by: Jisheng Zhang <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 1001354 commit 09f2ba0

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/regulator/gpio-regulator.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
162162
of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
163163

164164
config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
165-
if (config->enable_gpio == -EPROBE_DEFER)
166-
return ERR_PTR(-EPROBE_DEFER);
165+
if (config->enable_gpio < 0 && config->enable_gpio != -ENOENT)
166+
return ERR_PTR(config->enable_gpio);
167167

168168
/* Fetch GPIOs. - optional property*/
169169
ret = of_gpio_count(np);
@@ -190,8 +190,11 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
190190

191191
for (i = 0; i < config->nr_gpios; i++) {
192192
gpio = of_get_named_gpio(np, "gpios", i);
193-
if (gpio < 0)
193+
if (gpio < 0) {
194+
if (gpio != -ENOENT)
195+
return ERR_PTR(gpio);
194196
break;
197+
}
195198
config->gpios[i].gpio = gpio;
196199
if (proplen > 0) {
197200
of_property_read_u32_index(np, "gpios-states",

0 commit comments

Comments
 (0)