aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYan Li <yan.i.li@intel.com>2009-01-05 16:35:09 +0800
committerPeter Hutterer <peter.hutterer@who-t.net>2009-01-13 11:36:13 +1000
commit363d0bdb9fcae7f57f53c50667429ac9b37d41cc (patch)
tree62c41e87aee78b2759f721c390e74109760991a5
parentFinalize MB emu (and wakeup handlers) before closing the fd. (diff)
downloadxf86-input-evdev-363d0bdb9fcae7f57f53c50667429ac9b37d41cc.tar.gz
xf86-input-evdev-363d0bdb9fcae7f57f53c50667429ac9b37d41cc.tar.bz2
xf86-input-evdev-363d0bdb9fcae7f57f53c50667429ac9b37d41cc.zip
Fix XkbModel parsing error
Signed-off-by: Yan Li <yan.i.li@intel.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit d170cba0cdd8f7a2e500e094f5b21fc33aefb52a)
-rw-r--r--src/evdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 921f9ff..2c73c67 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -854,7 +854,7 @@ EvdevAddKeyClass(DeviceIntPtr device)
SetXkbOption(pInfo, "xkb_rules", &pEvdev->xkb_rules);
SetXkbOption(pInfo, "xkb_model", &pEvdev->xkb_model);
if (!pEvdev->xkb_model)
- SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_rules);
+ SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_model);
SetXkbOption(pInfo, "xkb_layout", &pEvdev->xkb_layout);
if (!pEvdev->xkb_layout)
SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout);