mirror of
https://github.com/X11Libre/xf86-input-synaptics.git
synced 2026-03-24 01:34:04 +00:00
eventcomm: don't ever probe if a device is set
If opening the fd fails we still need to fail the device. This is particularly the case when a device disappears before we can open it - the current code wouldn't exit but instead switch to auto-probe touchpad devices on the system. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
@@ -1009,13 +1009,13 @@ EventAutoDevProbe(InputInfoPtr pInfo, const char *device)
|
||||
|
||||
if (!(pInfo->flags & XI86_SERVER_FD))
|
||||
SYSCALL(close(fd));
|
||||
|
||||
/* if a device is set and not a touchpad (or already grabbed),
|
||||
* we must return FALSE. Otherwise, we'll add a device that
|
||||
* wasn't requested for and repeat
|
||||
* f5687a6741a19ef3081e7fd83ac55f6df8bcd5c2. */
|
||||
return touchpad_found;
|
||||
}
|
||||
|
||||
/* if a device is set and not a touchpad (or already grabbed),
|
||||
* we must return FALSE. Otherwise, we'll add a device that
|
||||
* wasn't requested for and repeat
|
||||
* f5687a6741a19ef3081e7fd83ac55f6df8bcd5c2. */
|
||||
return touchpad_found;
|
||||
}
|
||||
|
||||
i = scandir(DEV_INPUT_EVENT, &namelist, EventDevOnly, alphasort);
|
||||
|
||||
Reference in New Issue
Block a user