From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 29 Apr 2021 19:47:03 +0000 (+0200)
Subject: Merge branch 'for-5.13/wacom' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6c905ab1ace224e847536f658b7831e458e479dd;p=linux.git

Merge branch 'for-5.13/wacom' into for-linus

- Wacom pen handling fix from Ping Cheng
---

6c905ab1ace224e847536f658b7831e458e479dd
diff --cc drivers/hid/wacom_wac.c
index 2d70dc4bea654,5dfc5dfbbd196..81d7d12bcf342
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@ -3582,13 -3588,10 +3586,11 @@@ int wacom_setup_pen_input_capabilities(
  	else
  		__set_bit(INPUT_PROP_POINTER, input_dev->propbit);
  
- 	if (features->type == HID_GENERIC) {
- 		/* setup has already been done; apply otherwise-undetectible quirks */
- 		input_set_capability(input_dev, EV_KEY, BTN_STYLUS3);
+ 	if (features->type == HID_GENERIC)
+ 		/* setup has already been done */
  		return 0;
- 	}
  
 +	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
  	__set_bit(BTN_TOUCH, input_dev->keybit);
  	__set_bit(ABS_MISC, input_dev->absbit);