Commit 3ca232df authored by Jonathan Bakker's avatar Jonathan Bakker Committed by Dmitry Torokhov

Input: pwm-vibra - prevent unbalanced regulator

pwm_vibrator_stop disables the regulator, but it can be called from
multiple places, even when the regulator is already disabled. Fix this
by using regulator_is_enabled check when starting and stopping device.
Signed-off-by: default avatarJonathan Bakker <xc-racer2@live.ca>
Signed-off-by: default avatarPaweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 4d741f3d
...@@ -34,6 +34,7 @@ struct pwm_vibrator { ...@@ -34,6 +34,7 @@ struct pwm_vibrator {
struct work_struct play_work; struct work_struct play_work;
u16 level; u16 level;
u32 direction_duty_cycle; u32 direction_duty_cycle;
bool vcc_on;
}; };
static int pwm_vibrator_start(struct pwm_vibrator *vibrator) static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
...@@ -42,10 +43,13 @@ 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; struct pwm_state state;
int err; int err;
err = regulator_enable(vibrator->vcc); if (!vibrator->vcc_on) {
if (err) { err = regulator_enable(vibrator->vcc);
dev_err(pdev, "failed to enable regulator: %d", err); if (err) {
return err; dev_err(pdev, "failed to enable regulator: %d", err);
return err;
}
vibrator->vcc_on = true;
} }
pwm_get_state(vibrator->pwm, &state); pwm_get_state(vibrator->pwm, &state);
...@@ -76,7 +80,10 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator) ...@@ -76,7 +80,10 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
static void pwm_vibrator_stop(struct pwm_vibrator *vibrator) static void pwm_vibrator_stop(struct pwm_vibrator *vibrator)
{ {
regulator_disable(vibrator->vcc); if (vibrator->vcc_on) {
regulator_disable(vibrator->vcc);
vibrator->vcc_on = false;
}
if (vibrator->pwm_dir) if (vibrator->pwm_dir)
pwm_disable(vibrator->pwm_dir); pwm_disable(vibrator->pwm_dir);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment