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

BugLink: https://bugs.launchpad.net/bugs/1837952
[ Upstream commit 94803aef3533676194c772383472636c453e3147 ]

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: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c
index 9df87431d7d4ed68b7ee25cfc374880c9da30aeb..dbb6d9e1b9471380b50d66af222c89c75d472ac5 100644 (file)
--- a/drivers/input/misc/pwm-vibra.c
+++ b/drivers/input/misc/pwm-vibra.c
@@ -80,14 +80,14 @@ static int pwm_vibrator_start(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) {
                regulator_disable(vibrator->vcc);
                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)