]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Input: pm8xxx-vib - fix handling of separate enable register
authorStephan Gerhold <stephan@gerhold.net>
Fri, 17 Jan 2020 21:40:36 +0000 (13:40 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 21 Jan 2020 04:40:04 +0000 (20:40 -0800)
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>
drivers/input/misc/pm8xxx-vibrator.c

index ecd762f93732678cbc6eee68c807478722c5f900..53ad25eaf1a289e80aa64cfb97e2818c1df0fcd9 100644 (file)
@@ -90,7 +90,7 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)
 
        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;
 }