1 |
From 6ca2350e11f09d5d3e53777d1eff8ff6d300ed93 Mon Sep 17 00:00:00 2001 |
2 |
From: Jason Gerecke <killertofu@gmail.com> |
3 |
Date: Mon, 19 Jul 2021 13:55:28 -0700 |
4 |
Subject: HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT |
5 |
|
6 |
From: Jason Gerecke <killertofu@gmail.com> |
7 |
|
8 |
commit 6ca2350e11f09d5d3e53777d1eff8ff6d300ed93 upstream. |
9 |
|
10 |
Commit 670e90924bfe ("HID: wacom: support named keys on older devices") |
11 |
added support for sending named events from the soft buttons on the |
12 |
24HDT and 27QHDT. In the process, however, it inadvertantly disabled the |
13 |
touchscreen of the 24HDT and 27QHDT by default. The |
14 |
`wacom_set_shared_values` function would normally enable touch by default |
15 |
but because it checks the state of the non-shared `has_mute_touch_switch` |
16 |
flag and `wacom_setup_touch_input_capabilities` sets the state of the |
17 |
/shared/ version, touch ends up being disabled by default. |
18 |
|
19 |
This patch sets the non-shared flag, letting `wacom_set_shared_values` |
20 |
take care of copying the value over to the shared version and setting |
21 |
the default touch state to "on". |
22 |
|
23 |
Fixes: 670e90924bfe ("HID: wacom: support named keys on older devices") |
24 |
CC: stable@vger.kernel.org # 5.4+ |
25 |
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> |
26 |
Reviewed-by: Ping Cheng <ping.cheng@wacom.com> |
27 |
Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
28 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
29 |
--- |
30 |
drivers/hid/wacom_wac.c | 2 +- |
31 |
1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
|
33 |
--- a/drivers/hid/wacom_wac.c |
34 |
+++ b/drivers/hid/wacom_wac.c |
35 |
@@ -3829,7 +3829,7 @@ int wacom_setup_touch_input_capabilities |
36 |
wacom_wac->shared->touch->product == 0xF6) { |
37 |
input_dev->evbit[0] |= BIT_MASK(EV_SW); |
38 |
__set_bit(SW_MUTE_DEVICE, input_dev->swbit); |
39 |
- wacom_wac->shared->has_mute_touch_switch = true; |
40 |
+ wacom_wac->has_mute_touch_switch = true; |
41 |
} |
42 |
fallthrough; |
43 |
|