Commit 0ed72d3f authored by Jonathan Bakker's avatar Jonathan Bakker Committed by Greg Kroah-Hartman

Input: pwm-vibra - prevent unbalanced regulator

[ Upstream commit 3ca232df ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 98a137cd
...@@ -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,11 +43,14 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator) ...@@ -42,11 +43,14 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)
struct pwm_state state; struct pwm_state state;
int err; int err;
if (!vibrator->vcc_on) {
err = regulator_enable(vibrator->vcc); err = regulator_enable(vibrator->vcc);
if (err) { if (err) {
dev_err(pdev, "failed to enable regulator: %d", err); dev_err(pdev, "failed to enable regulator: %d", err);
return err; return err;
} }
vibrator->vcc_on = true;
}
pwm_get_state(vibrator->pwm, &state); pwm_get_state(vibrator->pwm, &state);
pwm_set_relative_duty_cycle(&state, vibrator->level, 0xffff); pwm_set_relative_duty_cycle(&state, vibrator->level, 0xffff);
...@@ -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)
{ {
if (vibrator->vcc_on) {
regulator_disable(vibrator->vcc); 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