From: Jason Gerecke <killertofu@xxxxxxxxx>
The xf86-input-wacom driver does not treat '0' as a valid serial number
and will drop any input report which contains an MSC_SERIAL = 0 event.
The kernel driver already takes care to avoid sending any MSC_SERIAL
event if the value of serial[0] == 0 (which is the case for devices
that don't actually report a serial number), but this is not quite
sufficient. Only the lower 32 bits of the serial get reported to
userspace, so if this portion of the serial is zero then there can still
be problems.
This commit allows the driver to report either the lower 32 bits if they
are non-zero or the upper 32 bits otherwise.
Signed-off-by: Jason Gerecke <jason.gerecke@xxxxxxxxx>
Fixes: f85c9dc678a5 ("HID: wacom: generic: Support tool ID and additional tool types")
CC: stable@xxxxxxxxxxxxxxx # v4.10
---
4.5/wacom_wac.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/4.5/wacom_wac.c b/4.5/wacom_wac.c
index b38094f..5a95891 100644
--- a/4.5/wacom_wac.c
+++ b/4.5/wacom_wac.c
@@ -2601,7 +2601,14 @@ static void wacom_wac_pen_report(struct hid_device *hdev,
wacom_wac->hid_data.tipswitch);
input_report_key(input, wacom_wac->tool[0], sense);
if (wacom_wac->serial[0]) {
- input_event(input, EV_MSC, MSC_SERIAL, wacom_wac->serial[0]);
+ /*
+ * xf86-input-wacom does not accept a serial number
+ * of '0'. Report the low 32 bits if possible, but
+ * if they are zero, report the upper ones instead.
+ */
+ __u32 serial_lo = wacom_wac->serial[0] & 0xFFFFFFFFu;
+ __u32 serial_hi = wacom_wac->serial[0] >> 32;
+ input_event(input, EV_MSC, MSC_SERIAL, serial_lo ? serial_lo : serial_hi);
input_report_abs(input, ABS_MISC, sense ? id : 0);
}
--
2.43.0
