diff options
| author |   Ping Cheng <pinglinux@gmail.com> | 2017-02-14 21:27:45 -0800 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2017-03-06 14:07:31 +0100 |
| commit | d793ff81879a5747109f3106bd18e77662cb5187 (patch) | |
| tree | 310ac836432817b0b665c8eda9efd9afc60f8797 /drivers/hid/wacom_sys.c | |
| parent | HID: wacom: generic: add mode change touch key (diff) | |
| download | linux-dev-d793ff81879a5747109f3106bd18e77662cb5187.tar.xz linux-dev-d793ff81879a5747109f3106bd18e77662cb5187.zip | |
HID: wacom: generic: support touch on/off softkey
Wacom Cintiq Pro has a softkey to turn touch on/off. Since it is
a softkey, hardware/firmware still reports touch events no matter
what state the softkey is. We need to ignore touch events when
the key is in off mode.
Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 9aec5b3a45bd..037b9c04745a 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -2100,8 +2100,10 @@ static void wacom_set_shared_values(struct wacom_wac *wacom_wac) wacom_wac->shared->touch_input = wacom_wac->touch_input; } - if (wacom_wac->has_mute_touch_switch) + if (wacom_wac->has_mute_touch_switch) { wacom_wac->shared->has_mute_touch_switch = true; + wacom_wac->shared->is_touch_on = true; + } if (wacom_wac->shared->has_mute_touch_switch && wacom_wac->shared->touch_input) { |