diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-24 12:47:29 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-24 12:47:29 +0930 |
| commit | 7dc40c8eca90ec1bfab84b6f54418b64c0e62d63 (patch) | |
| tree | a43a3e5bf6d2c9de0ab0753c00aad121e5c20e0f | |
| parent | cc13f87cd8ac54223fdb0b3d3c043dc9b9be5a42 (diff) | |
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.
| -rw-r--r-- | 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 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) |