Compare commits

...

2 Commits

Author SHA1 Message Date
Peter Hutterer
d5969caabe evdev 2.2.6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-19 13:45:57 +10:00
Peter Hutterer
5a4b0ba33d Finalize the middle button emulation when a read error occurs (#23048)
If a read error occurs, remove the block and wakeup handlers for middle
mouse button emulation. Otherwise, they'll still be around after the device
has been reopened and overwritten with the new ones created by EvdevOn. Once
this happened, future removal of the device can lead to a server crash.

X.Org Bug 23048 <http://bugs.freedesktop.org/show_bug.cgi?id=23048>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit f2dc0681fe)
2009-10-19 13:43:59 +10:00
2 changed files with 2 additions and 1 deletions

View File

@@ -22,7 +22,7 @@
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev], AC_INIT([xf86-input-evdev],
2.2.5, 2.2.6,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev) xf86-input-evdev)

View File

@@ -576,6 +576,7 @@ EvdevReadInput(InputInfoPtr pInfo)
{ {
if (errno == ENODEV) /* May happen after resume */ if (errno == ENODEV) /* May happen after resume */
{ {
EvdevMBEmuFinalize(pInfo);
xf86RemoveEnabledDevice(pInfo); xf86RemoveEnabledDevice(pInfo);
close(pInfo->fd); close(pInfo->fd);
pInfo->fd = -1; pInfo->fd = -1;