diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-23 14:48:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-23 14:53:11 +1000 |
| commit | 880ad1e19afd83ac115948b67d4049e16cb12df0 (patch) | |
| tree | 3acbdcd0ffeeee23c98a319fe98c7ca8edf1a69e | |
| parent | Add missing checks for ABI_XINPUT_VERSION 7. (diff) | |
| download | xf86-input-evdev-880ad1e19afd83ac115948b67d4049e16cb12df0.tar.gz xf86-input-evdev-880ad1e19afd83ac115948b67d4049e16cb12df0.tar.bz2 xf86-input-evdev-880ad1e19afd83ac115948b67d4049e16cb12df0.zip | |
Initialize the axis labels to 0, not "misc".
If we don't know what an axis label is, then don't initialize it. None is a
valid label.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/evdev.c b/src/evdev.c index 1d2ca36..922d5f3 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -2054,10 +2054,7 @@ static void EvdevInitAxesLabels(EvdevPtr pEvdev, int natoms, Atom *atoms) misc_label = AXIS_LABEL_PROP_ABS_MISC; } - /* First, make sure all atoms are initialized */ - atom = XIGetKnownProperty(misc_label); - for (axis = 0; axis < pEvdev->num_vals; axis++) - atoms[axis] = atom; + memset(atoms, 0, natoms * sizeof(Atom)); /* Now fill the ones we know */ for (axis = 0; axis < labels_len; axis++) |