From a86f3ef511db16be5ddc723bf14e770dad23ee45 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 May 2012 11:55:21 +1000 Subject: [PATCH] dix: change "still paired warning" to use BUG_RETURN_VAL Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- dix/devices.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index bbb4fa2a9..c6fd3aa09 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -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);