Skip to content

Commit f73d08d

Browse files
jigpuJiri Kosina
authored andcommitted
HID: wacom: Limit touchstrip data to 13 bits
Commit c7f0522 uses sixteen bits of data in the construction of 'strip1' and 'strip2'. This can cause problems in some cases, however, since some tablets store flags in the MSB of data[2] and data[4] that should not be included in these values. This restores the 0x1f mask that used prior to c7f0522. Signed-off-by: Jason Gerecke <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 8f9cfdd commit f73d08d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/hid/wacom_wac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
545545
((data[6] & 0x0F) << 4) |
546546
(data[5] & 0x0F);
547547
}
548-
strip1 = (data[1] << 8) | data[2];
549-
strip2 = (data[3] << 8) | data[4];
548+
strip1 = ((data[1] & 0x1f) << 8) | data[2];
549+
strip2 = ((data[3] & 0x1f) << 8) | data[4];
550550
}
551551

552552
prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |

0 commit comments

Comments
 (0)