aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/devices.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-25 06:29:35 +0000
committermarha <marha@users.sourceforge.net>2010-05-25 06:29:35 +0000
commit74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 (patch)
tree048118dcd2890da83b03e7842885c29014b2a037 /xorg-server/dix/devices.c
parent23e2ddeb0f81d5ee9c6d01cf0b768eeb1c27555c (diff)
downloadvcxsrv-74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58.tar.gz
vcxsrv-74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58.tar.bz2
vcxsrv-74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58.zip
xserver git update 25/5/2010
Diffstat (limited to 'xorg-server/dix/devices.c')
-rw-r--r--xorg-server/dix/devices.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index fae5361e8..85a008004 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -463,7 +463,8 @@ ActivateDevice(DeviceIntPtr dev, BOOL sendevent)
/* Initialize memory for sprites. */
if (IsMaster(dev) && dev->spriteInfo->spriteOwner)
- pScreen->DeviceCursorInitialize(dev, pScreen);
+ if (!pScreen->DeviceCursorInitialize(dev, pScreen))
+ ret = BadAlloc;
SendDevicePresenceEvent(dev->id, DeviceAdded);
if (sendevent)