path: root/config
diff options
authorPeter Hutterer <>2016-10-21 06:27:57 +1000
committerPeter Hutterer <>2016-10-26 15:35:07 +1000
commitd13cb974426f7f1110b0bdb08c4ebb46ff8975f7 (patch)
tree30ae9973ba52609e4885d260b473ad6721f8d951 /config
parent8fcf2fa78f09257933b17e7dc9a03a2034e3076f (diff)
ddx: add new call to purge input devices that weren't added
Special case for the systemd-logind case in xfree86: when we're vt-switched away and a device is plugged in, we get a paused fd from logind. Since we can't probe the device or do anything with it, we store that device in the xfree86 and handle it later when we vt-switch back. The device is not added to inputInfo.devices until that time. When the device is removed while still vt-switched away, the the config system never notifies the DDX. It only runs through inputInfo.devices and our device was never added to that. When a device is plugged in, removed, and plugged in again while vt-switched away, we have two entries in the xfree86-specific list that refer to the same device node, both pending for addition later. On VT switch back, the first one (the already removed one) will be added successfully, the second one (the still plugged-in one) fails. Since the fd is correct, the device works until it is removed again. The removed devices' config_info (i.e. the syspath) doesn't match the actual device we addded tough (the input number increases with each plug), it doesn't get removed, the fd remains open and we lose track of the fd count. Plugging the device in again leads to a dead device. Fix this by adding a call to notify the DDX to purge any remainders of devices with the given config_info, that's the only identifiable bit we have at this point. Signed-off-by: Peter Hutterer <> Reviewed-by: Hans de Goede <>
Diffstat (limited to 'config')
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.c b/config/config.c
index 1fb368c12..fb60295ae 100644
--- a/config/config.c
+++ b/config/config.c
@@ -107,6 +107,8 @@ remove_devices(const char *backend, const char *config_info)
if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
remove_device(backend, dev);
+ RemoveInputDeviceTraces(config_info);