From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jiri Kosina <jikos@kernel.org>, Jason Gerecke <killertofu@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Henrik Rydberg <rydberg@bitmath.org>,
linux-input@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] HID: wacom: bitwise vs logical ORs
Date: Wed, 9 Dec 2015 13:22:05 +0300 [thread overview]
Message-ID: <20151209102205.GB3173@mwanda> (raw)
Smatch complains that these should probably be bitwise ORs instead of
logical. It doesn't matter for "prox" but it makes a difference for
"strip1" and "strip2".
Fixes: c7f0522a1ad1 ('HID: wacom: Slim down wacom_intuos_pad processing')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 7cf0417..af330aa 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -545,12 +545,12 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
((data[6] & 0x0F) << 4) |
(data[5] & 0x0F);
}
- strip1 = (data[1] << 8) || data[2];
- strip2 = (data[3] << 8) || data[4];
+ strip1 = (data[1] << 8) | data[2];
+ strip2 = (data[3] << 8) | data[4];
}
- prox = (buttons & ~(~0 << nbuttons)) || (keys & ~(~0 << nkeys)) ||
- (ring1 & 0x80) || (ring2 & 0x80) || strip1 || strip2;
+ prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
+ (ring1 & 0x80) | (ring2 & 0x80) | strip1 | strip2;
wacom_report_numbered_buttons(input, nbuttons, buttons);
next reply other threads:[~2015-12-09 10:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 10:22 Dan Carpenter [this message]
2015-12-16 14:57 ` [patch] HID: wacom: bitwise vs logical ORs Jiri Kosina
2015-12-16 17:49 ` Jason Gerecke
2015-12-17 23:02 ` Jiri Kosina
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=20151209102205.GB3173@mwanda \
--to=dan.carpenter@oracle.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=killertofu@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=rydberg@bitmath.org \
/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).