[PATCH 13/20] dix: fix up a master check in ChangeKeyboardMapping handling.

[Peter Hutterer]

We don't just care about the directly attached master, we care about the
master keyboard.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 8be1903..f7018d0 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1664,7 +1664,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
                           stuff->keyCodes, NULL, client);
 
     for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
-        if (IsMaster(tmp) || tmp->u.master != pDev)
+        if (IsMaster(tmp) || GetMaster(tmp, MASTER_KEYBOARD) != pDev)
             continue;
         if (!tmp->key)
             continue;
-- 
1.7.4