From 74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 25 May 2010 06:29:35 +0000 Subject: xserver git update 25/5/2010 --- xorg-server/dix/devices.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xorg-server/dix') 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) -- cgit v1.2.3