From 8c332a836783b4f18b992253f4a94b694c9d0cf1 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 11 Oct 2008 02:10:48 +0200 Subject: Set pInfo->fd to -1 on DEVICE_CLOSE This allows the reopen logic to kick in later. DEVICE_CLOSE gets called on regen, so without this we'd keep a stale file descriptor in pInfo->fd in subsequent sessions. Debian bug#496101 (http://bugs.debian.org/496101) (cherry picked from commit b0b6399023bcdbb3337027f85c8da42d8b18c983) --- src/evdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index b12f2ff..6958578 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -986,8 +986,10 @@ EvdevProc(DeviceIntPtr device, int what) case DEVICE_CLOSE: xf86Msg(X_INFO, "%s: Close\n", pInfo->name); - if (pInfo->fd != -1) + if (pInfo->fd != -1) { close(pInfo->fd); + pInfo->fd = -1; + } break; } -- cgit v1.2.1