Revert "evdev: fix the check for tablet vs joystick"

There are a number of devices that have the ID_INPUT_JOYSTICK tag set by udev,
usually because of seemingly random event codes set. We cannot rely on
ID_INPUT_JOYSTICK to be accurate enough.

Fixes #517

This reverts commit eededbeb7f.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-08-13 09:40:03 +10:00
parent 834a6d1df1
commit 88b62031b3

View file

@ -1810,8 +1810,11 @@ evdev_configure_device(struct evdev_device *device)
evdev_disable_accelerometer_axes(device);
}
if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) {
evdev_log_info(device, "device is a joystick, ignoring\n");
/* libwacom *adds* TABLET, TOUCHPAD but leaves JOYSTICK in place, so
make sure we only ignore real joystick devices */
if (udev_tags == (EVDEV_UDEV_TAG_INPUT|EVDEV_UDEV_TAG_JOYSTICK)) {
evdev_log_info(device,
"device is a joystick, ignoring\n");
return NULL;
}