aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/devices.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-22 13:29:08 +0000
committermarha <marha@users.sourceforge.net>2010-05-22 13:29:08 +0000
commit8b1228fdd95f63ae5ed6f80597eafc973fc5bf57 (patch)
treeacc77d1da984ddb537e44e57d1741560cf0b058b /xorg-server/dix/devices.c
parentf5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (diff)
parent1a038249967b51878bc492df42e24b2af797bb85 (diff)
downloadvcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.tar.gz
vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.tar.bz2
vcxsrv-8b1228fdd95f63ae5ed6f80597eafc973fc5bf57.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/devices.c')
-rw-r--r--xorg-server/dix/devices.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index e65e5598e..c8b2940bc 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -311,10 +311,6 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
}
}
- /* Before actually enabling the device, we need to make sure the event
- * list's events have enough memory for a ClassesChangedEvent from the
- * device
- */
if ((*prev != dev) || !dev->inited ||
((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {
ErrorF("[dix] couldn't enable device %d\n", dev->id);