aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2009-05-10 08:29:21 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-11 08:19:04 +1000
commit9243d338d1de7df8afb1e254590cd4bf84888c7e (patch)
tree1c631f12369a2ba6ee0ce1a950f00334322ea3f3
parentRevamp the whole "has_axes" definition. (diff)
downloadxf86-input-evdev-9243d338d1de7df8afb1e254590cd4bf84888c7e.tar.gz
xf86-input-evdev-9243d338d1de7df8afb1e254590cd4bf84888c7e.tar.bz2
xf86-input-evdev-9243d338d1de7df8afb1e254590cd4bf84888c7e.zip
Fix copy-paste error when probing type name
A minor copy and paste error was introduced in 71e9a69e leaving an "if" where an "else if" should be. Without this, any device configured as XI_TOUCHPAD or XI_TABLET will end up having the type_name reset to either XI_TOUCHSCREEN or XI_MOUSE. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 56061a3..922d37f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1576,7 +1576,7 @@ EvdevProbe(InputInfoPtr pInfo)
} else if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask)) {
xf86Msg(X_INFO, "%s: Configuring as tablet\n", pInfo->name);
pInfo->type_name = XI_TABLET;
- } if (pEvdev->flags & EVDEV_TOUCHSCREEN) {
+ } else if (pEvdev->flags & EVDEV_TOUCHSCREEN) {
xf86Msg(X_INFO, "%s: Configuring as touchscreen\n", pInfo->name);
pInfo->type_name = XI_TOUCHSCREEN;
} else {