diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-07-31 16:39:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-08-07 08:17:06 +1000 |
| commit | 9791afc4c16eab92f30884a7e616dd93ac9b7513 (patch) | |
| tree | adb1de7903919f9d3751d99bf1734c44b673804e | |
| parent | evdev 2.7.2 (diff) | |
| download | xf86-input-evdev-9791afc4c16eab92f30884a7e616dd93ac9b7513.tar.gz xf86-input-evdev-9791afc4c16eab92f30884a7e616dd93ac9b7513.tar.bz2 xf86-input-evdev-9791afc4c16eab92f30884a7e616dd93ac9b7513.zip | |
Don't delete the device on ENODEV
This is signal handler code and we cannot clean up properly while in the
signal handler. So reduce the code to removing the signal handler and let
the device be cleaned up later.
If hotplugging is on, the server will remove it when the config backend says
so and if it is off, the server will remove it on shutdown.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
(cherry picked from commit 1cb8f074df8d16879ec80d778d26fb5b9af05a3b)
| -rw-r--r-- | src/evdev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/evdev.c b/src/evdev.c index fc7ba88..6729f23 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1107,12 +1107,8 @@ EvdevReadInput(InputInfoPtr pInfo) if (len <= 0) { if (errno == ENODEV) /* May happen after resume */ - { - EvdevMBEmuFinalize(pInfo); - Evdev3BEmuFinalize(pInfo); xf86RemoveEnabledDevice(pInfo); - EvdevCloseDevice(pInfo); - } else if (errno != EAGAIN) + else if (errno != EAGAIN) { /* We use X_NONE here because it doesn't alloc */ xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name, |