41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 33e7831b5fabc5c9dcc0224800a04761086952a7 Mon Sep 17 00:00:00 2001
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Date: Tue, 7 Aug 2012 14:32:17 +1000
|
|
Subject: [PATCH evdev] Fix broken ButtonMapping option (#53168)
|
|
|
|
Regression introduced in 8af0e6f1ebaf327f735bca507134b34bb24b26c6.
|
|
s is now initialized to NULL, so we never entered the loop.
|
|
|
|
X.Org Bug 53168 <http://bugs.freedesktop.org/show_bug.cgi?id=53168>
|
|
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
---
|
|
src/evdev.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/evdev.c b/src/evdev.c
|
|
index b832d98..ced6561 100644
|
|
--- a/src/evdev.c
|
|
+++ b/src/evdev.c
|
|
@@ -1671,7 +1671,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
|
|
|
|
xf86IDrvMsg(pInfo, X_CONFIG, "ButtonMapping '%s'\n", mapping);
|
|
map = mapping;
|
|
- while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS)
|
|
+ do
|
|
{
|
|
btn = strtol(map, &s, 10);
|
|
|
|
@@ -1685,7 +1685,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
|
|
|
|
pEvdev->btnmap[nbuttons++] = btn;
|
|
map = s;
|
|
- }
|
|
+ } while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS);
|
|
free(mapping);
|
|
}
|
|
|
|
--
|
|
1.7.10.4
|
|
|