diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 10:40:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 10:40:13 -0700 |
| commit | 45b30105e7231b70bb855923dbca443ee3ba44c3 (patch) | |
| tree | 3628af0d6e4be079c9638edb17e20dab74d19cea /drivers/input/joydev.c | |
| parent | 6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa (diff) | |
| parent | 7d6064d44bc79e328f2794ee7322ba2676511e2b (diff) | |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 7d7527f8b02d..627d343dfba1 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; |