hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/fix/gpio' into regulator-linus

This commit is contained in:
Mark Brown 2013-11-24 14:02:48 +00:00
parent 7e9e801f74 251b9c21d2
commit 3981560c2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/regulator/gpio-regulator.c
View File

@ -139,6 +139,7 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
struct property *prop; struct property *prop;
const char *regtype; const char *regtype;
int proplen, gpio, i; int proplen, gpio, i;
int ret;
config = devm_kzalloc(dev, config = devm_kzalloc(dev,
sizeof(struct gpio_regulator_config), sizeof(struct gpio_regulator_config),
@ -202,7 +203,11 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
} }
config->nr_states = i; config->nr_states = i;
of_property_read_string(np, "regulator-type", &regtype); ret = of_property_read_string(np, "regulator-type", &regtype);
if (ret < 0) {
dev_err(dev, "Missing 'regulator-type' property\n");
return ERR_PTR(-EINVAL);
}
if (!strncmp("voltage", regtype, 7)) if (!strncmp("voltage", regtype, 7))
config->type = REGULATOR_VOLTAGE; config->type = REGULATOR_VOLTAGE;