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:43:59 -0700 |
| commit | 0bed849274ba1408e45805000a13ccb1c94de4df (patch) | |
| tree | 6ca750545a4f1dc66c6d5559c3e5e62784be596b | |
| parent | 300ec625eb078f80424e1852d2c3afbe87a6e1c7 (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>
| -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 b1bd6dd32286..93c60e0f2b8e 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -481,6 +481,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; |