From 407ce81f5958b8a69305160ffd119dd1d388206e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Apr 2015 17:04:45 +1000 Subject: [PATCH libinput] touchpad: only pair with BUS_I8042 trackpoint devices A trackpoint on USB shouldn't get paired with the internal touchpoint. https://bugs.freedesktop.org/show_bug.cgi?id=89935 Signed-off-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index a663db9..4721860 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -827,7 +827,8 @@ tp_device_added(struct evdev_device *device, struct tp_dispatch *tp = (struct tp_dispatch*)device->dispatch; if (tp->buttons.trackpoint == NULL && - (added_device->tags & EVDEV_TAG_TRACKPOINT)) { + (added_device->tags & EVDEV_TAG_TRACKPOINT) && + libevdev_get_id_bustype(added_device->evdev) == BUS_I8042) { /* Don't send any pending releases to the new trackpoint */ tp->buttons.active_is_topbutton = false; tp->buttons.trackpoint = added_device; -- 2.3.4