|
@@ -3918,6 +3918,16 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
|
|
goto clean;
|
|
|
}
|
|
|
|
|
|
+ if ((config->ena_gpio || config->ena_gpio_initialized) &&
|
|
|
+ gpio_is_valid(config->ena_gpio)) {
|
|
|
+ ret = regulator_ena_gpio_request(rdev, config);
|
|
|
+ if (ret != 0) {
|
|
|
+ rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
|
|
|
+ config->ena_gpio, ret);
|
|
|
+ goto wash;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/* register with sysfs */
|
|
|
rdev->dev.class = ®ulator_class;
|
|
|
rdev->dev.parent = dev;
|
|
@@ -3931,16 +3941,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
|
|
|
|
|
dev_set_drvdata(&rdev->dev, rdev);
|
|
|
|
|
|
- if ((config->ena_gpio || config->ena_gpio_initialized) &&
|
|
|
- gpio_is_valid(config->ena_gpio)) {
|
|
|
- ret = regulator_ena_gpio_request(rdev, config);
|
|
|
- if (ret != 0) {
|
|
|
- rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
|
|
|
- config->ena_gpio, ret);
|
|
|
- goto wash;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
/* set regulator constraints */
|
|
|
if (init_data)
|
|
|
constraints = &init_data->constraints;
|