summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-11-27 14:49:08 +0100
committerJiri Kosina <jkosina@suse.cz>2014-11-27 14:49:08 +0100
commitf26441f561c8a24ff87e348fd9ecb72411b32ea5 (patch)
tree635859d0bba0d90a93ac54d201feec712d2caeff
parent3d9e35c76e0864d8cfdbc7884686c0b0cfde9908 (diff)
parentc376e7167e0ff390e07d60b4320398c3baae72a6 (diff)
downloadlinux-f26441f561c8a24ff87e348fd9ecb72411b32ea5.tar.gz
Merge branch 'for-3.19/wacom' into for-next
-rw-r--r--drivers/hid/wacom_wac.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 9565d31262ec..1468f008bfbd 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1484,9 +1484,11 @@ static void wacom_wac_finger_report(struct hid_device *hdev,
}
#define WACOM_PEN_FIELD(f) (((f)->logical == HID_DG_STYLUS) || \
- ((f)->physical == HID_DG_STYLUS))
+ ((f)->physical == HID_DG_STYLUS) || \
+ ((f)->application == HID_DG_PEN))
#define WACOM_FINGER_FIELD(f) (((f)->logical == HID_DG_FINGER) || \
- ((f)->physical == HID_DG_FINGER))
+ ((f)->physical == HID_DG_FINGER) || \
+ ((f)->application == HID_DG_TOUCHSCREEN))
void wacom_wac_usage_mapping(struct hid_device *hdev,
struct hid_field *field, struct hid_usage *usage)