From 4bcf43919a14cd2cd20af4099cd213ce25792edb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 10 May 2012 15:32:47 +1000
Subject: [PATCH] dix: use BUG_RETURN_VAL for pairing errors

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 dix/devices.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 0c62a012d..bbb4fa2a9 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -365,13 +365,12 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
                 /* mode doesn't matter */
                 EnterWindow(dev, screenInfo.screens[0]->root, NotifyAncestor);
             }
-            else if ((other = NextFreePointerDevice()) == NULL) {
-                ErrorF("[dix] cannot find pointer to pair with. "
-                       "This is a bug.\n");
-                return FALSE;
-            }
-            else
+            else {
+                other = NextFreePointerDevice();
+                BUG_RETURN_VAL_MSG(other == NULL, FALSE,
+                                   "[dix] cannot find pointer to pair with.\n");
                 PairDevices(NULL, other, dev);
+            }
         }
         else {
             if (dev->coreEvents)