Commit bac70a89 authored by Paweł Chmiel's avatar Paweł Chmiel Committed by Greg Kroah-Hartman

Input: pwm-vibra - stop regulator after disabling pwm, not before

[ Upstream commit 94803aef ]

This patch fixes order of disable calls in pwm_vibrator_stop.
Currently when starting device, we first enable vcc regulator and then
setup and enable pwm. When stopping, we should do this in oposite order,
so first disable pwm and then disable regulator.
Previously order was the same as in start.
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 0ed72d3f
...@@ -80,14 +80,14 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator) ...@@ -80,14 +80,14 @@ 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->pwm_dir)
pwm_disable(vibrator->pwm_dir);
pwm_disable(vibrator->pwm);
if (vibrator->vcc_on) { if (vibrator->vcc_on) {
regulator_disable(vibrator->vcc); regulator_disable(vibrator->vcc);
vibrator->vcc_on = false; vibrator->vcc_on = false;
} }
if (vibrator->pwm_dir)
pwm_disable(vibrator->pwm_dir);
pwm_disable(vibrator->pwm);
} }
static void pwm_vibrator_play_work(struct work_struct *work) static void pwm_vibrator_play_work(struct work_struct *work)
......
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