aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-08-15 11:34:12 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-08-15 11:34:12 +1000
commit070f30e08956e7fa8b7f9ca6b94fee3ef39caa1e (patch)
treeedd1cb270b222eca448f6947ba4e9c86dbd8da16
parentxf86-input-evdev: Return proper default for unknown values in pInfo->device_c... (diff)
downloadxf86-input-evdev-070f30e08956e7fa8b7f9ca6b94fee3ef39caa1e.tar.gz
xf86-input-evdev-070f30e08956e7fa8b7f9ca6b94fee3ef39caa1e.tar.bz2
xf86-input-evdev-070f30e08956e7fa8b7f9ca6b94fee3ef39caa1e.zip
Exit axis labelling if axes are neither rel nor abs
No actual effect since labels_len is always 0 anyway but let's make the return more explicit. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 917602a..bf5ebe0 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2201,7 +2201,8 @@ static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms)
{
labels = rel_labels;
labels_len = ArrayLength(rel_labels);
- }
+ } else
+ return;
memset(atoms, 0, natoms * sizeof(Atom));