Skip to content

Commit

Permalink
HID: wacom: bitwise vs logical ORs
Browse files Browse the repository at this point in the history
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: c7f0522 ('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>
  • Loading branch information
Dan Carpenter authored and Jiri Kosina committed Dec 17, 2015
1 parent be853fd commit 8f9cfdd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/hid/wacom_wac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 8f9cfdd

Please sign in to comment.