Message ID | 1436465511-5680-1-git-send-email-benjamin.tissoires@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Delegated to: | Jiri Kosina |
Headers | show |
On Thu, 9 Jul 2015, Benjamin Tissoires wrote: > As mentioned in the comment in the code, both the pen and touch data > come from the interface tagged as BAMBOO_PAD. The driver re-routes the > events for the Pen to the generic HID interface and keeps the ones for > the touch through this current interface. > > Clearing the WACOM_DEVICETYPE_PEN bit removes the extra unused interface > added in 2a6cdbd ("HID: wacom: Introduce new 'touch_input' device") and > makes the Bamboo PAD to behave like in 4.1. > > Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Applied to for-4.3/wacom.
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 0d24423..baba9a0 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -2223,10 +2223,10 @@ void wacom_setup_device_quirks(struct wacom *wacom) * 0, whose HID descriptor has an application usage of 0xFF0D * (i.e., WACOM_VENDORDEFINED_PEN). We route pen packets back * out through the HID_GENERIC device created for interface 1, - * so rewrite this one to be of type BTN_TOOL_FINGER. + * so rewrite this one to be of type WACOM_DEVICETYPE_TOUCH. */ if (features->type == BAMBOO_PAD) - features->device_type |= WACOM_DEVICETYPE_TOUCH; + features->device_type = WACOM_DEVICETYPE_TOUCH; if (wacom->hdev->bus == BUS_BLUETOOTH) features->quirks |= WACOM_QUIRK_BATTERY;