summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-12-09 13:22:05 +0300
committerJiri Kosina <jkosina@suse.cz>2015-12-18 00:01:35 +0100
commit8f9cfdd359478ea70da0144b0cb407a4734f14cd (patch)
tree898fbdf0bb48d18e56bb91ba3675a407c0a1446e /drivers/hid
parentbe853fd1c6a5fe127af3392157dfe95e9712a575 (diff)
downloadlinux-8f9cfdd359478ea70da0144b0cb407a4734f14cd.tar.bz2
HID: wacom: bitwise vs logical ORs
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> Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/wacom_wac.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index bec23001c219..22d32259e1f1 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);