HID: wacom - Add quirks for INTUOSHT2 in range events
authorPing Cheng <pinglinux@gmail.com>
Sat, 9 Jan 2016 01:16:25 +0000 (17:16 -0800)
committerJiri Kosina <jkosina@suse.cz>
Mon, 18 Jan 2016 22:02:57 +0000 (23:02 +0100)
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>
drivers/hid/wacom_wac.c

index 28f6a9e2ad6fe9f2c3efcf8196da68aa3bbcbb81..e92e1e855a728725c66dbba1c06edc60cb2339f5 100644 (file)
@@ -613,6 +613,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
                case 0x885: /* Intuos3 Marker Pen */
                case 0x802: /* Intuos4/5 13HD/24HD General Pen */
                case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */
+               case 0x8e2: /* IntuosHT2 pen */
                case 0x022:
                case 0x100804: /* Intuos4/5 13HD/24HD Art Pen */
                case 0x140802: /* Intuos4/5 13HD/24HD Classic Pen */
@@ -680,7 +681,8 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
 
        /* in Range */
        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 */
                if (wacom->reporting_data) {