Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c
index 55da191ae550..dbb6d9e1b947 100644
--- a/drivers/input/misc/pwm-vibra.c
+++ b/drivers/input/misc/pwm-vibra.c
@@ -34,6 +34,7 @@ struct pwm_vibrator {
         struct work_struct play_work;
         u16 level;
         u32 direction_duty_cycle;
+        bool vcc_on;
 };
 
 static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
@@ -42,10 +43,13 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
         struct pwm_state state;
         int err;
 
-        err = regulator_enable(vibrator->vcc);
-        if (err) {
-                dev_err(pdev, "failed to enable regulator: %d", err);
-                return err;
+        if (!vibrator->vcc_on) {
+                err = regulator_enable(vibrator->vcc);
+                if (err) {
+                        dev_err(pdev, "failed to enable regulator: %d", err);
+                        return err;
+                }
+                vibrator->vcc_on = true;
         }
 
         pwm_get_state(vibrator->pwm, &state);
@@ -76,11 +80,14 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
 
 static void pwm_vibrator_stop(struct pwm_vibrator *vibrator)
 {
-        regulator_disable(vibrator->vcc);
-
         if (vibrator->pwm_dir)
                 pwm_disable(vibrator->pwm_dir);
         pwm_disable(vibrator->pwm);
+
+        if (vibrator->vcc_on) {
+                regulator_disable(vibrator->vcc);
+                vibrator->vcc_on = false;
+        }
 }
 
 static void pwm_vibrator_play_work(struct work_struct *work)