diff options
-rw-r--r-- | drivers/regulator/gpio-regulator.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index bcd827c363dc..cdb9d947d914 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c | |||
@@ -203,17 +203,15 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np) | |||
203 | } | 203 | } |
204 | config->nr_states = i; | 204 | config->nr_states = i; |
205 | 205 | ||
206 | config->type = REGULATOR_VOLTAGE; | ||
206 | ret = of_property_read_string(np, "regulator-type", ®type); | 207 | ret = of_property_read_string(np, "regulator-type", ®type); |
207 | if (ret < 0) { | 208 | if (ret >= 0) { |
208 | dev_err(dev, "Missing 'regulator-type' property\n"); | 209 | if (!strncmp("voltage", regtype, 7)) |
209 | return ERR_PTR(-EINVAL); | 210 | config->type = REGULATOR_VOLTAGE; |
211 | else if (!strncmp("current", regtype, 7)) | ||
212 | config->type = REGULATOR_CURRENT; | ||
210 | } | 213 | } |
211 | 214 | ||
212 | if (!strncmp("voltage", regtype, 7)) | ||
213 | config->type = REGULATOR_VOLTAGE; | ||
214 | else if (!strncmp("current", regtype, 7)) | ||
215 | config->type = REGULATOR_CURRENT; | ||
216 | |||
217 | return config; | 215 | return config; |
218 | } | 216 | } |
219 | 217 | ||