summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-11-27 16:20:13 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-12-03 08:24:04 +1000
commit66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b (patch)
treee3f930ccfb9deeab4346356a6a788358748b1f0f
parent83d90b90bcb71c89750f92a177361e53dd261414 (diff)
dix: remove core devices when shutting down. (#25028)
NewInputDeviceRequest (and RemoveDevice) have checks in place to not allow removal of the VCP/VCK. When shutting down, they need to be cleaned up nonetheless to free the memory associated. X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com>
-rw-r--r--dix/devices.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c
index bb7b23b83..6329d2810 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -907,6 +907,9 @@ CloseDownDevices(void)
DeleteInputDeviceRequest(dev);
}
+ CloseDevice(inputInfo.pointer);
+ CloseDevice(inputInfo.keyboard);
+
inputInfo.devices = NULL;
inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL;