From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Ping Cheng <pinglinux@gmail.com>
Cc: linux-input@vger.kernel.org, Ping Cheng <pingc@wacom.com>
Subject: Re: [PATCH] Input: wacom - Fix wacom->shared guards for dual input devices
Date: Thu, 16 Jan 2014 16:28:58 -0800 [thread overview]
Message-ID: <20140117002858.GC837@core.coreip.homeip.net> (raw)
In-Reply-To: <1389823457-3649-1-git-send-email-pingc@wacom.com>
On Wed, Jan 15, 2014 at 02:04:17PM -0800, Ping Cheng wrote:
> features->quirks can have multiple bits set. For dual input, we only
> need to check WACOM_QUIRK_MULTI_INPUT.
>
> Reviewed-by: Jason Gerecke <killertofu@gmail.com>
> Signed-off-by: Ping Cheng <pingc@wacom.com>
Applied, thank you.
> ---
> drivers/input/tablet/wacom_wac.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 048e5b3..0bcc7a6 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -331,7 +331,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
>
> /* Enter report */
> if ((data[1] & 0xfc) == 0xc0) {
> - if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
> + if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
> wacom->shared->stylus_in_proximity = true;
>
> /* serial number of the tool */
> @@ -436,7 +436,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
>
> /* Exit report */
> if ((data[1] & 0xfe) == 0x80) {
> - if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
> + if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
> wacom->shared->stylus_in_proximity = false;
>
> /*
> --
> 1.8.3.2
>
--
Dmitry
prev parent reply other threads:[~2014-01-17 0:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 22:04 [PATCH] Input: wacom - Fix wacom->shared guards for dual input devices Ping Cheng
2014-01-17 0:28 ` 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=20140117002858.GC837@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=pingc@wacom.com \
--cc=pinglinux@gmail.com \
/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).