diff options
| -rw-r--r-- | drivers/hid/wacom_wac.c | 8 |
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) | |||
| 545 | ((data[6] & 0x0F) << 4) | | 545 | ((data[6] & 0x0F) << 4) | |
| 546 | (data[5] & 0x0F); | 546 | (data[5] & 0x0F); |
| 547 | } | 547 | } |
| 548 | strip1 = (data[1] << 8) || data[2]; | 548 | strip1 = (data[1] << 8) | data[2]; |
| 549 | strip2 = (data[3] << 8) || data[4]; | 549 | strip2 = (data[3] << 8) | data[4]; |
| 550 | } | 550 | } |
| 551 | 551 | ||
| 552 | prox = (buttons & ~(~0 << nbuttons)) || (keys & ~(~0 << nkeys)) || | 552 | prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) | |
| 553 | (ring1 & 0x80) || (ring2 & 0x80) || strip1 || strip2; | 553 | (ring1 & 0x80) | (ring2 & 0x80) | strip1 | strip2; |
| 554 | 554 | ||
| 555 | wacom_report_numbered_buttons(input, nbuttons, buttons); | 555 | wacom_report_numbered_buttons(input, nbuttons, buttons); |
| 556 | 556 | ||