From 6216abe0c1a94efa4b2f0d14e88278f128304cd2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 30 Nov 2007 11:34:24 +1030 Subject: [PATCH] dix: avoid activating the VCP/VCK twice. This may set dev->key-xkbinfo to NULL, causing a segfault in xkb code lateron. Spotted by David Huggins-Daines. --- dix/devices.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 98cd290e2..4c9c4fb97 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -572,9 +572,6 @@ InitCoreDevices(void) if (!AllocateDevicePrivate(inputInfo.pointer, CoreDevicePrivatesIndex)) FatalError("Couldn't allocate pointer devPrivates\n"); inputInfo.pointer->devPrivates[CoreDevicePrivatesIndex].ptr = NULL; - - ActivateDevice(inputInfo.keyboard); - ActivateDevice(inputInfo.pointer); } /**