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

- Wacom pen handling fix from Ping Cheng

diff --cc drivers/hid/wacom_wac.c
index 2d70dc4bea654bc9bfbf3df81bb15990ffc8c11a,5dfc5dfbbd196ee95b1a86f3b8851694111cf128..81d7d12bcf342bedcb1f0e2eaa71e3a4e361da2f
--- 1/drivers/hid/wacom_wac.c
--- 2/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);