From 011cee3103c146c8096b7098a27993f99e07a824 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 9 Apr 2009 08:14:39 +1000
Subject: [PATCH] dix: fix dev/keybd variable mixup.

Reported-by: Eric Anhold <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 dix/devices.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 4a36669ac..b9d1c85a5 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1925,14 +1925,14 @@ ProcBell(ClientPtr client)
     else
 	newpercent = base - newpercent + stuff->percent;
 
-    for (keybd = inputInfo.devices; keybd; keybd = keybd->next) {
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
         if ((dev == keybd || (!dev->isMaster && dev->u.master == keybd)) &&
-            keybd->kbdfeed && keybd->kbdfeed->BellProc) {
+            dev->kbdfeed && dev->kbdfeed->BellProc) {
 
 	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
 	    if (rc != Success)
 		return rc;
-            XkbHandleBell(FALSE, FALSE, keybd, newpercent,
+            XkbHandleBell(FALSE, FALSE, dev, newpercent,
                           &dev->kbdfeed->ctrl, 0, None, NULL, client);
         }
     }