diff options
-rw-r--r-- | drivers/regulator/core.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 744c9889f88d..3c987d76e684 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -3918,6 +3918,16 @@ regulator_register(const struct regulator_desc *regulator_desc, | |||
3918 | goto clean; | 3918 | goto clean; |
3919 | } | 3919 | } |
3920 | 3920 | ||
3921 | if ((config->ena_gpio || config->ena_gpio_initialized) && | ||
3922 | gpio_is_valid(config->ena_gpio)) { | ||
3923 | ret = regulator_ena_gpio_request(rdev, config); | ||
3924 | if (ret != 0) { | ||
3925 | rdev_err(rdev, "Failed to request enable GPIO%d: %d\n", | ||
3926 | config->ena_gpio, ret); | ||
3927 | goto wash; | ||
3928 | } | ||
3929 | } | ||
3930 | |||
3921 | /* register with sysfs */ | 3931 | /* register with sysfs */ |
3922 | rdev->dev.class = ®ulator_class; | 3932 | rdev->dev.class = ®ulator_class; |
3923 | rdev->dev.parent = dev; | 3933 | rdev->dev.parent = dev; |
@@ -3931,16 +3941,6 @@ regulator_register(const struct regulator_desc *regulator_desc, | |||
3931 | 3941 | ||
3932 | dev_set_drvdata(&rdev->dev, rdev); | 3942 | dev_set_drvdata(&rdev->dev, rdev); |
3933 | 3943 | ||
3934 | if ((config->ena_gpio || config->ena_gpio_initialized) && | ||
3935 | gpio_is_valid(config->ena_gpio)) { | ||
3936 | ret = regulator_ena_gpio_request(rdev, config); | ||
3937 | if (ret != 0) { | ||
3938 | rdev_err(rdev, "Failed to request enable GPIO%d: %d\n", | ||
3939 | config->ena_gpio, ret); | ||
3940 | goto wash; | ||
3941 | } | ||
3942 | } | ||
3943 | |||
3944 | /* set regulator constraints */ | 3944 | /* set regulator constraints */ |
3945 | if (init_data) | 3945 | if (init_data) |
3946 | constraints = &init_data->constraints; | 3946 | constraints = &init_data->constraints; |