aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-26 08:58:03 +0000
committermarha <marha@users.sourceforge.net>2010-05-26 08:58:03 +0000
commite60ed91097aa7511581b6c53b9e4b14aaf1027b5 (patch)
treec8ce06db36103141858e95febad857ca989e7ad0 /xorg-server/hw/kdrive
parentfb91c8589937f1a9aba5d5a4e0de98c381dfe9b8 (diff)
parentfade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff)
downloadvcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.gz
vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.bz2
vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive')
-rw-r--r--xorg-server/hw/kdrive/linux/evdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/linux/evdev.c b/xorg-server/hw/kdrive/linux/evdev.c
index 20df77b99..71b93931b 100644
--- a/xorg-server/hw/kdrive/linux/evdev.c
+++ b/xorg-server/hw/kdrive/linux/evdev.c
@@ -165,7 +165,7 @@ EvdevPtrRead (int evdevPort, void *closure)
n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
if (n <= 0) {
if (errno == ENODEV)
- DeleteInputDeviceRequest(pi->dixdev);
+ DeleteInputDeviceRequest(pi->dixdev, 0);
return;
}
@@ -375,7 +375,7 @@ EvdevKbdRead (int evdevPort, void *closure)
n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
if (n <= 0) {
if (errno == ENODEV)
- DeleteInputDeviceRequest(ki->dixdev);
+ DeleteInputDeviceRequest(ki->dixdev, 0);
return;
}