2015-04-16 00:23:47

by Jason Gerecke

Subject: [PATCH] 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 <[email protected]>
---
drivers/hid/wacom_wac.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 69c7df7..2292d85 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -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++) {
--
2.3.5

2015-04-23 08:06:26

by Jiri Kosina

Subject: Re: [PATCH] HID: wacom: Simplify check for presence of single-finger touch

On Wed, 15 Apr 2015, Jason Gerecke wrote:

> 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 <[email protected]>

Applied to for-4.2/wacom.

--
Jiri Kosina
SUSE Labs