| Message ID | 20190124202732.14723-2-pawel.mikolaj.chmiel@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 94803aef3533676194c772383472636c453e3147 |
| Headers | show |
| Series | [v2,1/2] input: misc: pwm-vibra: Prevent unbalanced regulator | expand |
On Thu, Jan 24, 2019 at 09:27:32PM +0100, Paweł Chmiel wrote: > 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> Applied, thank you. > --- > drivers/input/misc/pwm-vibra.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c > index 9df87431d7d4..dbb6d9e1b947 100644 > --- 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) > -- > 2.17.1 >
diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c index 9df87431d7d4..dbb6d9e1b947 100644 --- 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)
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> --- drivers/input/misc/pwm-vibra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)