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.

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Vojtech Pavlik and committed by

Dmitry Torokhov 21 years ago f24949e8 7741e931

+1 -1

1 changed file

expand all

drivers

input

joydev.c

+1 -1

drivers/input/joydev.c

··· 422 422 joydev->nkey++; 423 423 } 424 424 425 - for (i = 0; i < BTN_JOYSTICK - BTN_MISC + 1; i++) 425 + for (i = 0; i < BTN_JOYSTICK - BTN_MISC; i++) 426 426 if (test_bit(i + BTN_MISC, dev->keybit)) { 427 427 joydev->keymap[i] = joydev->nkey; 428 428 joydev->keypam[joydev->nkey] = i + BTN_MISC;