summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Xinput.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-09 11:29:11 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-10 16:57:32 +1030
commit5e213fe1022bf96747834a3ac227929b23136ee6 (patch)
tree5fd292d67dc853198c3a5044ce2bc80471ec78fd /hw/xfree86/common/xf86Xinput.c
parent05cdef18ca668ffc86b71033f71cfbd262cdd994 (diff)
xfree86: cache dev->isMaster before freeing the device.
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.c')
-rw-r--r--hw/xfree86/common/xf86Xinput.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index f8f3577b2..5be08413c 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -611,6 +611,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
InputDriverPtr drv;
IDevRec *idev;
IDevPtr *it;
+ Bool isMaster = pDev->isMaster;
if (pInfo) /* need to get these before RemoveDevice */
{
@@ -621,7 +622,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
OsBlockSignals();
RemoveDevice(pDev);
- if (!pDev->isMaster)
+ if (!isMaster)
{
if(drv->UnInit)
drv->UnInit(drv, pInfo, 0);