From 8bf2f562678107c346e8664f18c10f315c2768f5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 9 Apr 2009 08:14:39 +1000 Subject: dix: fix dev/keybd variable mixup. Reported-by: Eric Anhold Signed-off-by: Peter Hutterer --- dix/devices.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dix/devices.c') diff --git a/dix/devices.c b/dix/devices.c index 27148d6de..ed6e6bdd4 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1930,14 +1930,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); } } -- cgit v1.2.3