2 files changed, 18 insertions, 17 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 1245dca79009..a4a8a6dc60c4 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1839,10 +1839,12 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
         }
 
         if (rdev->ena_pin) {
-                ret = regulator_ena_gpio_ctrl(rdev, true);
-                if (ret < 0)
-                        return ret;
-                rdev->ena_gpio_state = 1;
+                if (!rdev->ena_gpio_state) {
+                        ret = regulator_ena_gpio_ctrl(rdev, true);
+                        if (ret < 0)
+                                return ret;
+                        rdev->ena_gpio_state = 1;
+                }
         } else if (rdev->desc->ops->enable) {
                 ret = rdev->desc->ops->enable(rdev);
                 if (ret < 0)
@@ -1939,10 +1941,12 @@ static int _regulator_do_disable(struct regulator_dev *rdev)
         trace_regulator_disable(rdev_get_name(rdev));
 
         if (rdev->ena_pin) {
-                ret = regulator_ena_gpio_ctrl(rdev, false);
-                if (ret < 0)
-                        return ret;
-                rdev->ena_gpio_state = 0;
+                if (rdev->ena_gpio_state) {
+                        ret = regulator_ena_gpio_ctrl(rdev, false);
+                        if (ret < 0)
+                                return ret;
+                        rdev->ena_gpio_state = 0;
+                }
 
         } else if (rdev->desc->ops->disable) {
                 ret = rdev->desc->ops->disable(rdev);
@@ -3626,12 +3630,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
                                  config->ena_gpio, ret);
                         goto wash;
                 }
-
-                if (config->ena_gpio_flags & GPIOF_OUT_INIT_HIGH)
-                        rdev->ena_gpio_state = 1;
-
-                if (config->ena_gpio_invert)
-                        rdev->ena_gpio_state = !rdev->ena_gpio_state;
         }
 
         /* set regulator constraints */
@@ -3800,9 +3798,11 @@ int regulator_suspend_finish(void)
         list_for_each_entry(rdev, &regulator_list, list) {
                 mutex_lock(&rdev->mutex);
                 if (rdev->use_count > 0  || rdev->constraints->always_on) {
-                        error = _regulator_do_enable(rdev);
-                        if (error)
-                                ret = error;
+                        if (!_regulator_is_enabled(rdev)) {
+                                error = _regulator_do_enable(rdev);
+                                if (error)
+                                        ret = error;
+                        }
                 } else {
                         if (!have_full_constraints())
                                 goto unlock;
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index e2cffe01b807..fb991ec76423 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>