rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- don't call drv->UnInit if device doesn't have driver

Browse Source
This commit is contained in:
Adam Tkac 2009-02-12 18:13:40 +00:00
parent 306a46dc6e
commit 7f7f7d5ccd
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.5.99.902 Version: 1.5.99.902
Release: 9%{?dist} Release: 10%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -90,6 +90,9 @@ Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
# In master, nominated for 1.6 # In master, nominated for 1.6
Patch6014: xserver-1.5.99.902-always-RAW.patch 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 moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
%define sdkdir %{_includedir}/xorg %define sdkdir %{_includedir}/xorg
@ -506,6 +509,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * 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. - xserver-1.5.99.902-always-RAW.patch: always init the console to RAW mode.

29
xserver-1.5.99.902-vnc.patch Normal file
View File

@ -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