From a50c40be1f28467bcef7dc71fab54ebdddacffdf Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat, 21 Feb 2009 08:09:40 +1000
Subject: [PATCH] dix: don't apply button mappings to SDs, or the device's MD.
 (#20122)

Only ever change the button map on the device we actually care about, not the
attached SDs, not the current MD of the device.

X.Org Bug 20122 <http://bugs.freedesktop.org/show_bug.cgi?id=20122>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
---
 dix/inpututils.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/dix/inpututils.c b/dix/inpututils.c
index 366a89799..07a2383e7 100644
--- a/dix/inpututils.c
+++ b/dix/inpututils.c
@@ -119,24 +119,6 @@ ApplyPointerMapping(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)
         return ret;
     do_butmap_change(dev, map, len, client);
 
-    /* Change any attached masters/slaves. */
-    if (dev->isMaster) {
-        for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
-            if (!tmp->isMaster && tmp->u.master == dev)
-                if (check_butmap_change(tmp, map, len, NULL, client) == Success)
-                    do_butmap_change(tmp, map, len, client);
-        }
-    }
-    else {
-        for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
-            if (tmp->isMaster && tmp->u.lastSlave == dev) {
-                /* If this fails, expect the results to be weird. */
-                if (check_butmap_change(tmp, map, len, NULL, client) == Success)
-                    do_butmap_change(tmp, map, len, client);
-            }
-        }
-    }
-
     return Success;
 }