diff options
| author | Kenneth Waters <kwwaters@gmail.com> | 2010-09-21 00:58:23 -0700 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-06 18:08:09 -0500 |
| commit | a182c5219f8ab1fffd3947b57999f10f8852ca2b (patch) | |
| tree | acc5945844c5854ce2097e4c3f1fae792e1817e3 /drivers/input | |
| parent | 3f5d42c68a0fa5c4ce63fa66fdaa98c2bdab0192 (diff) | |
Input: joydev - fix JSIOCSAXMAP ioctl
commit d2520a426dc3033c00077e923a553fc6c98c7564 upstream.
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>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joydev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 423e0e6031a..03254804d3d 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; |