Adam Tkac 7f7f7d
From 62cd546931f99504bcf830f20eeefe0dbc81f8a9 Mon Sep 17 00:00:00 2001
Adam Tkac 7f7f7d
From: Fedora X Ninjas <x@fedoraproject.org>
Adam Tkac 7f7f7d
Date: Thu, 12 Feb 2009 18:52:57 +0100
Adam Tkac 7f7f7d
Subject: [PATCH] Don't call drv->UnInit if device doesn't have driver.
Adam Tkac 7f7f7d
Adam Tkac 7f7f7d
This bug probably isn't reproducable with "standard" devices and drivers but it
Adam Tkac 7f7f7d
is reproducable with VNC devices. They are slave devices which doesn't have
Adam Tkac 7f7f7d
LocalDevice structure filled. Upstream bug with more details -
Adam Tkac 7f7f7d
https://bugs.freedesktop.org/show_bug.cgi?id=20087.
Adam Tkac 7f7f7d
---
Adam Tkac 7f7f7d
 hw/xfree86/common/xf86Xinput.c |    2 +-
Adam Tkac 7f7f7d
 1 files changed, 1 insertions(+), 1 deletions(-)
Adam Tkac 7f7f7d
Adam Tkac 7f7f7d
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
Adam Tkac 7f7f7d
index 96352a4..3d89e39 100644
Adam Tkac 7f7f7d
--- a/hw/xfree86/common/xf86Xinput.c
Adam Tkac 7f7f7d
+++ b/hw/xfree86/common/xf86Xinput.c
Adam Tkac 7f7f7d
@@ -668,7 +668,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
Adam Tkac 7f7f7d
     OsBlockSignals();
Adam Tkac 7f7f7d
     RemoveDevice(pDev);
Adam Tkac 7f7f7d
 
Adam Tkac 7f7f7d
-    if (!isMaster)
Adam Tkac 7f7f7d
+    if (!isMaster && pInfo != NULL)
Adam Tkac 7f7f7d
     {
Adam Tkac 7f7f7d
         if(drv->UnInit)
Adam Tkac 7f7f7d
             drv->UnInit(drv, pInfo, 0);
Adam Tkac 7f7f7d
-- 
Adam Tkac 7f7f7d
1.6.1.3
Adam Tkac 7f7f7d