diff options
| author |   Ping Cheng <pinglinux@gmail.com> | 2016-01-08 17:16:25 -0800 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2016-01-18 23:02:57 +0100 |
| commit | 526d6e7b57062c494346149fb2d6aff0be78ed89 (patch) | |
| tree | fcb04fbc779e685b2ab7c8e35d30203a9260cf0e /drivers/hid | |
| parent | HID: wacom - Cleanup touch arbitration logic (diff) | |
| download | linux-dev-526d6e7b57062c494346149fb2d6aff0be78ed89.tar.xz linux-dev-526d6e7b57062c494346149fb2d6aff0be78ed89.zip | |
HID: wacom - Add quirks for INTUOSHT2 in range events
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 28f6a9e2ad6f..e92e1e855a72 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -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) { |