From 7f7f7d5ccdcbb016c864fc54d5057071d3b285b7 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Feb 12 2009 18:13:40 +0000
Subject: - don't call drv->UnInit if device doesn't have driver


---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 1c8ffee..9bec622 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.902
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -90,6 +90,9 @@ Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
 # In master, nominated for 1.6
 Patch6014: xserver-1.5.99.902-always-RAW.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=20087
+Patch6015: xserver-1.5.99.902-vnc.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -506,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 12 2009 Adam Tkac <atkac redhat com> 1.5.99.902-10
+- don't call drv->UnInit if device doesn't have driver
+
 * Wed Feb 11 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-9
 - xserver-1.5.99.902-always-RAW.patch: always init the console to RAW mode.
 
diff --git a/xserver-1.5.99.902-vnc.patch b/xserver-1.5.99.902-vnc.patch
new file mode 100644
index 0000000..1619ddc
--- /dev/null
+++ b/xserver-1.5.99.902-vnc.patch
@@ -0,0 +1,29 @@
+From 62cd546931f99504bcf830f20eeefe0dbc81f8a9 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Thu, 12 Feb 2009 18:52:57 +0100
+Subject: [PATCH] Don't call drv->UnInit if device doesn't have driver.
+
+This bug probably isn't reproducable with "standard" devices and drivers but it
+is reproducable with VNC devices. They are slave devices which doesn't have
+LocalDevice structure filled. Upstream bug with more details -
+https://bugs.freedesktop.org/show_bug.cgi?id=20087.
+---
+ hw/xfree86/common/xf86Xinput.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
+index 96352a4..3d89e39 100644
+--- a/hw/xfree86/common/xf86Xinput.c
++++ b/hw/xfree86/common/xf86Xinput.c
+@@ -668,7 +668,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
+     OsBlockSignals();
+     RemoveDevice(pDev);
+ 
+-    if (!isMaster)
++    if (!isMaster && pInfo != NULL)
+     {
+         if(drv->UnInit)
+             drv->UnInit(drv, pInfo, 0);
+-- 
+1.6.1.3
+