From b9ec408872cc4764d404d7b9057802ae476266bc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Jul 2020 13:04:25 +1000 Subject: [PATCH] evdev: drop the check for tablet vs joystick libwacom has been unsetting ID_INPUT_JOYSTICK for known tablets since 2015 (libwacom 0.12) so this comment is outdated. And the input-id udev builtin never labels something as tablet *and* joystick. Which means: systemd sets either tablet or joystick. For tablets that are known to libwacom the joystick bit gets corrected and we only see the tablet bits. Tablets unknown to libwacom remain as joysticks and are ignored but that's the behavior we had anyway. Signed-off-by: Peter Hutterer --- src/evdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 560412aa..0d8e8766 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1810,11 +1810,7 @@ evdev_configure_device(struct evdev_device *device) evdev_disable_accelerometer_axes(device); } - /* libwacom *adds* TABLET, TOUCHPAD but leaves JOYSTICK in place, so - make sure we only ignore real joystick devices */ - const unsigned int joystick_tag = EVDEV_UDEV_TAG_JOYSTICK; - const unsigned int joystick_or_tablet_tag = EVDEV_UDEV_TAG_JOYSTICK|EVDEV_UDEV_TAG_TABLET; - if ((udev_tags & joystick_or_tablet_tag) == joystick_tag) { + if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) { evdev_log_info(device, "device is a joystick, ignoring\n"); return NULL; }