From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Stephan Gerhold <stephan@gerhold.net>
Cc: linux-input@vger.kernel.org,
Damien Riegel <damien.riegel@savoirfairelinux.com>
Subject: Re: [PATCH v2] Input: pm8xxx-vib - fix handling of separate enable register
Date: Mon, 20 Jan 2020 20:44:38 -0800 [thread overview]
Message-ID: <20200121044438.GM47797@dtor-ws> (raw)
In-Reply-To: <20200114183442.45720-1-stephan@gerhold.net>
On Tue, Jan 14, 2020 at 07:34:42PM +0100, Stephan Gerhold wrote:
> 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.
>
> Cc: Damien Riegel <damien.riegel@savoirfairelinux.com>
> Fixes: d4c7c5c96c92 ("Input: pm8xxx-vib - handle separate enable register")
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Applied, thank you.
> ---
> v1: https://patchwork.kernel.org/patch/11286073/
> Changes in v2:
> - Changed regmap_update_bits(..., regs->enable_mask, on ? regs->enable_mask : 0)
> to regmap_update_bits(..., regs->enable_mask, on ? ~0 : 0)
> (suggested by Dmitry Torokhov)
> ---
> drivers/input/misc/pm8xxx-vibrator.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c
> index ecd762f93732..53ad25eaf1a2 100644
> --- a/drivers/input/misc/pm8xxx-vibrator.c
> +++ b/drivers/input/misc/pm8xxx-vibrator.c
> @@ -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;
> }
> --
> 2.24.1
>
--
Dmitry
prev parent reply other threads:[~2020-01-21 4:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 18:34 [PATCH v2] Input: pm8xxx-vib - fix handling of separate enable register Stephan Gerhold
2020-01-21 4:44 ` Dmitry Torokhov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200121044438.GM47797@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=damien.riegel@savoirfairelinux.com \
--cc=linux-input@vger.kernel.org \
--cc=stephan@gerhold.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).