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>

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 7d7527f8b02dc6f832cfcde761138bbd17b9d0c8..627d343dfba17cecce6aaa64cc27471f600a01ed 100644 (file)
--- 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;