lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 015/183] Input: pwm-vibra - prevent unbalanced regulator
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 3ca232df9921f083c3b37ba5fbc76f4d9046268b ]

    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: Jonathan Bakker <xc-racer2@live.ca>
    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>
    ---
    drivers/input/misc/pwm-vibra.c | 17 ++++++++++++-----
    1 file changed, 12 insertions(+), 5 deletions(-)

    diff --git a/drivers/input/misc/pwm-vibra.c b/drivers/input/misc/pwm-vibra.c
    index 55da191ae550..9df87431d7d4 100644
    --- a/drivers/input/misc/pwm-vibra.c
    +++ b/drivers/input/misc/pwm-vibra.c
    @@ -34,6 +34,7 @@ struct pwm_vibrator {
    struct work_struct play_work;
    u16 level;
    u32 direction_duty_cycle;
    + bool vcc_on;
    };

    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;
    int err;

    - err = regulator_enable(vibrator->vcc);
    - if (err) {
    - dev_err(pdev, "failed to enable regulator: %d", err);
    - return err;
    + if (!vibrator->vcc_on) {
    + err = regulator_enable(vibrator->vcc);
    + if (err) {
    + dev_err(pdev, "failed to enable regulator: %d", err);
    + return err;
    + }
    + vibrator->vcc_on = true;
    }

    pwm_get_state(vibrator->pwm, &state);
    @@ -76,7 +80,10 @@ static int pwm_vibrator_start(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)
    pwm_disable(vibrator->pwm_dir);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 12:48    [W:4.197 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site