summaryrefslogtreecommitdiffstats
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorKenneth Waters <kwwaters@gmail.com>2010-09-21 00:58:23 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-21 00:59:43 -0700
commitd2520a426dc3033c00077e923a553fc6c98c7564 (patch)
tree2da6646f8a1a588692830e51dca61e716639dc14 /drivers/input/joydev.c
parent38e7afe96c7c0ad900824911c61fdb04078033dc (diff)
downloadlinux-d2520a426dc3033c00077e923a553fc6c98c7564.tar.bz2
Input: joydev - fix JSIOCSAXMAP ioctl
Fixed JSIOCSAXMAP ioctl to update absmap, the map from hardware axis to event axis in addition to abspam. This fixes a regression introduced by 999b874f. Signed-off-by: Kenneth Waters <kwwaters@gmail.com> Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index d85bd8a7967d..22239e988498 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -483,6 +483,9 @@ static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,
memcpy(joydev->abspam, abspam, len);
+ for (i = 0; i < joydev->nabs; i++)
+ joydev->absmap[joydev->abspam[i]] = i;
+
out:
kfree(abspam);
return retval;