diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-27 16:20:13 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-03 10:17:29 +1000 |
| commit | e840999ffc93ecb2d870dfed334e093ca1e5e65b (patch) | |
| tree | c92d112de21b5b0fd1b6eceaf818003f706176b1 /dix | |
| parent | 51aad8bebca938a41837ad73c98a0039665fa22f (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>
(cherry picked from commit 66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b)
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c index 395e19acf..e3fd456d4 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -908,6 +908,9 @@ CloseDownDevices(void) DeleteInputDeviceRequest(dev); } + CloseDevice(inputInfo.pointer); + CloseDevice(inputInfo.keyboard); + inputInfo.devices = NULL; inputInfo.off_devices = NULL; inputInfo.keyboard = NULL; |