[PATCH 1/6] HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT

[PATCH 1/6] HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT

[Jason Gerecke]

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>
---
 drivers/hid/wacom_wac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 81d7d12bcf34..496a000ef862 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -3831,7 +3831,7 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev,
 		    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;
 
-- 
2.32.0

Re: [PATCH 1/6] HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT

[Jiri Kosina]

On Mon, 19 Jul 2021, Jason Gerecke wrote:

> 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>
> ---
>  drivers/hid/wacom_wac.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index 81d7d12bcf34..496a000ef862 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -3831,7 +3831,7 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev,
>  		    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;
>  

This patch series looks strangely like not really a series at all :) I am 
applying 1/6 and 4/6 for 5.14 and queuing the rest for 5.15. Please shout 
if you disagree with that. Thanks,

-- 
Jiri Kosina
SUSE Labs