diff options
| author | Kenneth Waters <kwwaters@gmail.com> | 2010-09-21 00:58:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 21:51:19 -0700 |
| commit | 1a93a2c2bebfc831296f0e4f8a394efac9f9b33f (patch) | |
| tree | eb8f85478a4f05501009eb279162824a1a75244a /drivers | |
| parent | 81e8f58379abbc46f29b7fcba6acfce90e362736 (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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 34157bb97ed..f5320b558c7 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; |