| From 885e89f601a52cc6fb025b009df58ba83d142734 Mon Sep 17 00:00:00 2001 |
| From: Jason Gerecke <killertofu@gmail.com> |
| Date: Wed, 18 Oct 2017 08:27:13 -0700 |
| Subject: HID: wacom: generic: Recognize WACOM_HID_WD_PEN as a type of pen collection |
| |
| From: Jason Gerecke <killertofu@gmail.com> |
| |
| commit 885e89f601a52cc6fb025b009df58ba83d142734 upstream. |
| |
| The WACOM_PEN_FIELD macro is used to determine if a given HID field should be |
| associated with pen input. This field includes several known collection types |
| that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application |
| collection type is notably missing. This can result in fields within this |
| kind of collection being completely ignored by the `wacom_usage_mapping` |
| function, preventing the later '*_event' functions from being notified about |
| changes to their value. |
| |
| Fixes: c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages") |
| Fixes: ac2423c975 ("HID: wacom: generic: add vendor defined touch") |
| Reviewed-by: Ping Cheng <ping.cheng@wacom.com> |
| Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> |
| Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/wacom_wac.h | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/hid/wacom_wac.h |
| +++ b/drivers/hid/wacom_wac.h |
| @@ -166,6 +166,7 @@ |
| ((f)->physical == HID_DG_PEN) || \ |
| ((f)->application == HID_DG_PEN) || \ |
| ((f)->application == HID_DG_DIGITIZER) || \ |
| + ((f)->application == WACOM_HID_WD_PEN) || \ |
| ((f)->application == WACOM_HID_WD_DIGITIZER) || \ |
| ((f)->application == WACOM_HID_G9_PEN) || \ |
| ((f)->application == WACOM_HID_G11_PEN)) |