diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:14:23 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:14:23 +0100 |
| commit | 01125b2d1fe9d691333cc90b17a4e2fd5bb908a2 (patch) | |
| tree | 7fab7e06d41302e621d7ad00493b15baf81b8ea4 /drivers/hid/wacom_sys.c | |
| parent | 4b545304947147bd4b9890160d328780c97bac33 (diff) | |
| parent | 5b01b3b8b122fde7fbe116803f7863667b4c5beb (diff) | |
| download | linux-01125b2d1fe9d691333cc90b17a4e2fd5bb908a2.tar.bz2 | |
Merge branch 'for-4.15/wacom' into for-linus
- High resolution mode for DEll canvas support, from Benjamin Tissoires
- A lot of improvements to pen handling in the Wacom driver, from Jason Gerecke
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 906e654fb0ba..ee71ad9b6cc1 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -196,6 +196,13 @@ static void wacom_feature_mapping(struct hid_device *hdev, kfree(data); break; } + + if (hdev->vendor == USB_VENDOR_ID_WACOM && + hdev->product == 0x4200 /* Dell Canvas 27 */ && + field->application == HID_UP_MSVENDOR) { + wacom->wacom_wac.mode_report = field->report->id; + wacom->wacom_wac.mode_value = 2; + } } /* |