summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2005-05-28 02:11:49 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-05-28 02:11:49 -0500
commitf24949e8e0b9bed223ad9a435bf37e91ee8d0db7 (patch)
tree2ce8db8615de5423204922c86bfd6cf821dee542 /drivers/input
parent7741e9317137a7456baa9c09ad8308c80c23b8db (diff)
downloadop-kernel-dev-f24949e8e0b9bed223ad9a435bf37e91ee8d0db7.zip
op-kernel-dev-f24949e8e0b9bed223ad9a435bf37e91ee8d0db7.tar.gz
Input: Fix button mapping in joydev - BTN_TRIGGER was being
mapped twice, resulting in it being the last (instead of first) button on a joystick. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/joydev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 7d7527f8..627d343 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -422,7 +422,7 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct
joydev->nkey++;
}
- for (i = 0; i < BTN_JOYSTICK - BTN_MISC + 1; i++)
+ for (i = 0; i < BTN_JOYSTICK - BTN_MISC; i++)
if (test_bit(i + BTN_MISC, dev->keybit)) {
joydev->keymap[i] = joydev->nkey;
joydev->keypam[joydev->nkey] = i + BTN_MISC;
OpenPOWER on IntegriCloud