projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...
[cascardo/linux.git]
/
drivers
/
hid
/
wacom_wac.c
diff --git
a/drivers/hid/wacom_wac.c
b/drivers/hid/wacom_wac.c
index
d811e87
..
232da89
100644
(file)
--- a/
drivers/hid/wacom_wac.c
+++ b/
drivers/hid/wacom_wac.c
@@
-1072,6
+1072,9
@@
static int wacom_wac_finger_count_touches(struct wacom_wac *wacom)
int count = 0;
int i;
+ if (!touch_max)
+ return 0;
+
if (touch_max == 1)
return test_bit(BTN_TOUCH, input->key) &&
!wacom->shared->stylus_in_proximity;