frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: change "still paired warning" to use BUG_RETURN_VAL 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2012-05-10 11:55:21 +10:00
parent 4bcf43919a
commit a86f3ef511
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dix/devices.c
View File

@ -457,13 +457,9 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
}
if (IsMaster(dev) && dev->spriteInfo->sprite) {
for (other = inputInfo.devices; other; other = other->next) {
if (other->spriteInfo->paired == dev) {
ErrorF("[dix] cannot disable device, still paired. "
"This is a bug. \n");
return FALSE;
}
}
for (other = inputInfo.devices; other; other = other->next)
BUG_RETURN_VAL_MSG(other->spriteInfo->paired == dev, FALSE,
"%s still paired with %s", dev->name, other->spriteInfo->paired->name);
}
(void) (*dev->deviceProc) (dev, DEVICE_OFF);