Skip to content

Commit 6ca2350

Browse files
jigpuJiri Kosina
authored andcommitted
HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT
Commit 670e909 ("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: 670e909 ("HID: wacom: support named keys on older devices") CC: [email protected] # 5.4+ Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 0818ec1 commit 6ca2350

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/hid/wacom_wac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3831,7 +3831,7 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev,
38313831
wacom_wac->shared->touch->product == 0xF6) {
38323832
input_dev->evbit[0] |= BIT_MASK(EV_SW);
38333833
__set_bit(SW_MUTE_DEVICE, input_dev->swbit);
3834-
wacom_wac->shared->has_mute_touch_switch = true;
3834+
wacom_wac->has_mute_touch_switch = true;
38353835
}
38363836
fallthrough;
38373837

0 commit comments

Comments
 (0)