diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2019-05-24 14:38:12 -0700 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2019-05-24 15:00:08 -0700 |
| commit | 3b30bb3dcd64d9467e5b5e2cbe014c11bd347317 (patch) | |
| tree | 6aa51f7892b1bfc353ddf8de6286dc8a6f8b1725 | |
| parent | 33cdf63a0089bdd1e66e350cc621b80415a7c8ba (diff) | |
| download | xf86-input-wacom-3b30bb3dcd64d9467e5b5e2cbe014c11bd347317.tar.gz | |
USB: Don't use ABS_MISC for tool ID information with a generic tablet
Generic devices don't store tool ID information in ABS_MISC, so we should
be careful to not accidentally interpret other miscellaneous data as such.
Ref: https://github.com/linuxwacom/xf86-input-wacom/issues/52
| -rw-r--r-- | src/wcmUSB.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c index 3515563..339f809 100644 --- a/src/wcmUSB.c +++ b/src/wcmUSB.c @@ -1640,7 +1640,8 @@ static int deviceTypeFromEvent(WacomCommonPtr common, int type, int code, int va case ABS_MT_TRACKING_ID: return TOUCH_ID; case ABS_MISC: - return usbFindDeviceTypeById(value); + if (common->wcmProtocolLevel != WCM_PROTOCOL_GENERIC) + return usbFindDeviceTypeById(value); } } |