Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <jszhang@marvell.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Jisheng Zhang and committed by
Mark Brown
09f2ba0b 1001354c

+6 -3
+6 -3
drivers/regulator/gpio-regulator.c
··· 162 162 of_property_read_u32(np, "startup-delay-us", &config->startup_delay); 163 163 164 164 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); 167 167 168 168 /* Fetch GPIOs. - optional property*/ 169 169 ret = of_gpio_count(np); ··· 190 190 191 191 for (i = 0; i < config->nr_gpios; i++) { 192 192 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); 194 196 break; 197 + } 195 198 config->gpios[i].gpio = gpio; 196 199 if (proplen > 0) { 197 200 of_property_read_u32_index(np, "gpios-states",