Skip to content

Commit 605d359

Browse files
committed
HID: wacom: Hardcode (non-inverted) AES pens as BTN_TOOL_PEN
Unlike EMR tools which encode type information in their tool ID, tools for AES sensors are all "generic pens". It is inappropriate to make use of the wacom_intuos_get_tool_type function when dealing with these kinds of devices. Instead, we should only ever report BTN_TOOL_PEN or BTN_TOOL_RUBBER, as depending on the state of the Eraser and Invert bits. Reported-by: Daniel Jutz <daniel@djutz.com> Closes: https://lore.kernel.org/linux-input/3cd82004-c5b8-4f2a-9a3b-d88d855c65e4@heusel.eu/ Bisected-by: Christian Heusel <christian@heusel.eu> Fixes: 9c2913b962da ("HID: wacom: more appropriate tool type categorization") Link: https://gitlab.freedesktop.org/libinput/libinput/-/issues/1041 Link: #440 Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Cc: stable@vger.kernel.org Acked-by: Benjamin Tissoires <bentiss@kernel.org> Signed-off-by: Jiri Kosina <jkosina@suse.com> [jason.gerecke@wacom.com: Imported into input-wacom (2934b12281ab)] Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
1 parent 5010aed commit 605d359

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

4.18/wacom_wac.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,6 +2592,8 @@ static void wacom_wac_pen_report(struct hid_device *hdev,
25922592
/* Going into range select tool */
25932593
if (wacom_wac->hid_data.invert_state)
25942594
wacom_wac->tool[0] = BTN_TOOL_RUBBER;
2595+
else if (wacom_wac->features.quirks & WACOM_QUIRK_AESPEN)
2596+
wacom_wac->tool[0] = BTN_TOOL_PEN;
25952597
else if (wacom_wac->id[0])
25962598
wacom_wac->tool[0] = wacom_intuos_get_tool_type(wacom_wac->id[0]);
25972599
else

0 commit comments

Comments
 (0)