lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 33/92] Input: pm8xxx-vib - fix handling of separate enable register
    Date
    From: Stephan Gerhold <stephan@gerhold.net>

    commit 996d5d5f89a558a3608a46e73ccd1b99f1b1d058 upstream.

    Setting the vibrator enable_mask is not implemented correctly:

    For regmap_update_bits(map, reg, mask, val) we give in either
    regs->enable_mask or 0 (= no-op) as mask and "val" as value.
    But "val" actually refers to the vibrator voltage control register,
    which has nothing to do with the enable_mask.

    So we usually end up doing nothing when we really wanted
    to enable the vibrator.

    We want to set or clear the enable_mask (to enable/disable the vibrator).
    Therefore, change the call to always modify the enable_mask
    and set the bits only if we want to enable the vibrator.

    Fixes: d4c7c5c96c92 ("Input: pm8xxx-vib - handle separate enable register")
    Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
    Link: https://lore.kernel.org/r/20200114183442.45720-1-stephan@gerhold.net
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/misc/pm8xxx-vibrator.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/input/misc/pm8xxx-vibrator.c
    +++ b/drivers/input/misc/pm8xxx-vibrator.c
    @@ -98,7 +98,7 @@ static int pm8xxx_vib_set(struct pm8xxx_

    if (regs->enable_mask)
    rc = regmap_update_bits(vib->regmap, regs->enable_addr,
    - on ? regs->enable_mask : 0, val);
    + regs->enable_mask, on ? ~0 : 0);

    return rc;
    }

    \
     
     \ /
      Last update: 2020-01-28 15:27    [W:4.039 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site