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: Simplify check for presence of single-finger touch
To determine if a touch is present in the single-touch case, we can simply check if the BTN_TOUCH key is active or not. This will work for both HID_GENERIC and other device types. Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
e48151a3a4
commit
71b5c4766c
1 changed files with 2 additions and 3 deletions
|
@ -1072,9 +1072,8 @@ static int wacom_wac_finger_count_touches(struct wacom_wac *wacom)
|
|||
int count = 0;
|
||||
int i;
|
||||
|
||||
/* non-HID_GENERIC single touch input doesn't call this routine */
|
||||
if ((touch_max == 1) && (wacom->features.type == HID_GENERIC))
|
||||
return wacom->hid_data.tipswitch &&
|
||||
if (touch_max == 1)
|
||||
return test_bit(BTN_TOUCH, input->key) &&
|
||||
!wacom->shared->stylus_in_proximity;
|
||||
|
||||
for (i = 0; i < input->mt->num_slots; i++) {
|
||||
|
|
Loading…
Reference in a new issue