Commit a86f3ef5 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

dix: change "still paired warning" to use BUG_RETURN_VAL

Signed-off-by: Peter Hutterer's avatarPeter Hutterer <>
Reviewed-by: default avatarChase Douglas <>
parent 4bcf4391
......@@ -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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment