[PATCH:xf86-input-keyboard] Close device fd when called with DEVICE_CLOSE

Alan Coopersmith alan.coopersmith at oracle.com
Wed Aug 11 19:54:59 PDT 2010


From: Aaron Zang <aaron.zang at sun.com>

Fixes Solaris bug 6886424:
 VT - keyboard and mouse do not work when switching to vt7
 http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6886424

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 src/kbd.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/kbd.c b/src/kbd.c
index 96409cf..991fe01 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -464,6 +464,14 @@ KbdProc(DeviceIntPtr device, int what)
       RemoveEnabledDevice(pInfo->fd);
     pKbd->KbdOff(pInfo, what);
     device->public.on = FALSE;
+
+    if (what == DEVICE_CLOSE) {
+	xf86Msg(X_INFO, "%s: Close\n", pInfo->name);
+	if (pInfo->fd != -1) {
+	    close(pInfo->fd);
+	    pInfo->fd = -1;
+	}
+    }
     break;
   }
   return (Success);
-- 
1.5.6.5



More information about the xorg-devel mailing list