Commit f24949e8 authored by Vojtech Pavlik's avatar Vojtech Pavlik Committed by Dmitry Torokhov
Browse files

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: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 7741e931

drivers/input/joydev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;