summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-08-14 01:11:53 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-08-14 01:11:53 -0700
commit66b222493b3af6b7fc200d8a296317e9f3e1820a (patch)
tree3308bb6aa878f46da868f80e686d1c265d695a34
parent2aaef2754215d1a9f1073ad32f2ba498ce12188a (diff)
Revert "Close device fd when called with DEVICE_CLOSE"
This reverts commit f8e219828db920c4cd7a2645a6194de029dc9bb5. (Sorry, failed to finish rebase operation to remove before pushing. As noted on xorg-devel, this patch was originally made for 1.3.2 and needs to be reworked to reflect later upstream changes.)
-rw-r--r--src/kbd.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/kbd.c b/src/kbd.c
index 9b78eba..a9d4890 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -430,14 +430,6 @@ 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);