leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HID: wacom - Add quirks for INTUOSHT2 in range events

Browse Source 
INTUOSHT2 in range event is not used to indicate in proximity state.
INTUOSHT2 only has one stylus.

Signed-off-by: Ping Cheng <pingc@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Ping Cheng 2016-01-08 17:16:25 -08:00 committed by Jiri Kosina
parent c1b03f5511
commit 526d6e7b57
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/wacom_wac.c
View File

@ -613,6 +613,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
case 0x885: /* Intuos3 Marker Pen */ case 0x885: /* Intuos3 Marker Pen */
case 0x802: /* Intuos4/5 13HD/24HD General Pen */ case 0x802: /* Intuos4/5 13HD/24HD General Pen */
case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */ case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */
case 0x8e2: /* IntuosHT2 pen */
case 0x022: case 0x022:
case 0x100804: /* Intuos4/5 13HD/24HD Art Pen */ case 0x100804: /* Intuos4/5 13HD/24HD Art Pen */
case 0x140802: /* Intuos4/5 13HD/24HD Classic Pen */ case 0x140802: /* Intuos4/5 13HD/24HD Classic Pen */
@ -680,7 +681,8 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
/* in Range */ /* in Range */
if ((data[1] & 0xfe) == 0x20) { if ((data[1] & 0xfe) == 0x20) {
wacom->shared->stylus_in_proximity = true; if (features->type != INTUOSHT2)
wacom->shared->stylus_in_proximity = true;
/* in Range while exiting */ /* in Range while exiting */
if (wacom->reporting_data) { if (wacom->reporting_data) {