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