From 7dc40c8eca90ec1bfab84b6f54418b64c0e62d63 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 24 Apr 2008 12:47:29 +0930
Subject: xfree86: Don't free master devices.

The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
---
 hw/xfree86/common/xf86Xinput.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 30e0e6bd7..8ff31e845 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -490,7 +490,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
     }
     RemoveDevice(pDev);
 
-    if (!pInfo) /* VCP and VCK */
+    if (pDev->isMaster)
         return;
 
     if(drv->UnInit)
-- 
cgit v1.2.3