fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-29 08:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfree86: suspend signals while removing a device (corrected version).

Browse source 
Block/Release is now symmetrical.
This commit is contained in:
Peter Hutterer 2008-06-02 10:40:10 +09:30
parent 95ecaa411a
commit ac1db45449
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
hw/xfree86/common/xf86Xinput.c
View file

@ -475,28 +475,31 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
drv = pInfo->drv;
idev = pInfo->conf_idev;
}
OsBlockSignals();
RemoveDevice(pDev);
if (pDev->isMaster)
return;
if(drv->UnInit)
drv->UnInit(drv, pInfo, 0);
else
xf86DeleteInput(pInfo, 0);
/* devices added through HAL aren't in the config layout */
it = xf86ConfigLayout.inputs;
while(*it && *it != idev)
it++;
if (!(*it)) /* end of list, not in the layout */
if (!pDev->isMaster)
{
xfree(idev->driver);
xfree(idev->identifier);
xf86optionListFree(idev->commonOptions);
xfree(idev);
if(drv->UnInit)
drv->UnInit(drv, pInfo, 0);
else
xf86DeleteInput(pInfo, 0);
/* devices added through HAL aren't in the config layout */
it = xf86ConfigLayout.inputs;
while(*it && *it != idev)
it++;
if (!(*it)) /* end of list, not in the layout */
{
xfree(idev->driver);
xfree(idev->identifier);
xf86optionListFree(idev->commonOptions);
xfree(idev);
}
}
OsReleaseSignals();
}
/*