xserver: Branch 'mpx'

[Peter Hutterer]

 hw/xfree86/common/xf86Xinput.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree bc4ae25433e38a25a2012f9f233d500665172a4b (from 4b8b0e377a27ec904b2028c89aed11c6416af26c)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Fri Feb 23 12:06:51 2007 +1030

    xfree86: Don't initialize sprites for devices that don't own a sprite (stops
             keyboard hotplug segfaults)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index c2ea108..608fa9b 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -421,7 +421,8 @@ NewInputDeviceRequest (InputOption *opti
         EnableDevice(dev);
 
     /* send enter/leave event, update sprite window */
-    InitializeSprite(dev, GetCurrentRootWindow());
+    if (dev->spriteOwner)
+        InitializeSprite(dev, GetCurrentRootWindow());
     CheckMotion(NULL, dev);
 
     return Success;