From c2a9e0a96983f22f721196513e75a53ea0b86d7e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 11 Feb 2011 11:41:47 +1000
Subject: [PATCH] mi: simplify a "check for keyboard" condition

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
---
 mi/mipointer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 124f9de4d..aa0ca6d78 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -193,8 +193,7 @@ miPointerDisplayCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     miPointerPtr pPointer;
 
     /* return for keyboards */
-    if ((IsMaster(pDev) && !DevHasCursor(pDev)) ||
-        (!IsMaster(pDev) && pDev->u.master && !DevHasCursor(pDev->u.master)))
+    if (!IsPointerDevice(pDev))
             return FALSE;
 
     pPointer = MIPOINTER(pDev);