xfree86: suspend signals while removing a device (corrected version).
Block/Release is now symmetrical.
This commit is contained in:
parent
95ecaa411a
commit
ac1db45449
|
@ -475,11 +475,12 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
|
||||||
drv = pInfo->drv;
|
drv = pInfo->drv;
|
||||||
idev = pInfo->conf_idev;
|
idev = pInfo->conf_idev;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OsBlockSignals();
|
||||||
RemoveDevice(pDev);
|
RemoveDevice(pDev);
|
||||||
|
|
||||||
if (pDev->isMaster)
|
if (!pDev->isMaster)
|
||||||
return;
|
{
|
||||||
|
|
||||||
if(drv->UnInit)
|
if(drv->UnInit)
|
||||||
drv->UnInit(drv, pInfo, 0);
|
drv->UnInit(drv, pInfo, 0);
|
||||||
else
|
else
|
||||||
|
@ -498,6 +499,8 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
|
||||||
xfree(idev);
|
xfree(idev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
OsReleaseSignals();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* convenient functions to post events
|
* convenient functions to post events
|
||||||
|
|
Loading…
Reference in New Issue
Block a user