mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
HID: wacom: Limit touchstrip data to 13 bits
Commitc7f0522
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 toc7f0522
. Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
8f9cfdd359
commit
f73d08d073
1 changed files with 2 additions and 2 deletions
|
@ -545,8 +545,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
|
||||||
((data[6] & 0x0F) << 4) |
|
((data[6] & 0x0F) << 4) |
|
||||||
(data[5] & 0x0F);
|
(data[5] & 0x0F);
|
||||||
}
|
}
|
||||||
strip1 = (data[1] << 8) | data[2];
|
strip1 = ((data[1] & 0x1f) << 8) | data[2];
|
||||||
strip2 = (data[3] << 8) | data[4];
|
strip2 = ((data[3] & 0x1f) << 8) | data[4];
|
||||||
}
|
}
|
||||||
|
|
||||||
prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
|
prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |
|
||||||
|
|
Loading…
Reference in a new issue