Messages in this thread Patch in this message | | | Date | Fri, 22 Oct 2010 11:34:48 -0700 | From | Greg KH <> | Subject | [21/66] Input: joydev - fix JSIOCSAXMAP ioctl |
| |
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: Kenneth Waters <kwwaters@gmail.com>
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>
--- drivers/input/joydev.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -481,6 +481,9 @@ static int joydev_handle_JSIOCSAXMAP(str memcpy(joydev->abspam, abspam, len); + for (i = 0; i < joydev->nabs; i++) + joydev->absmap[joydev->abspam[i]] = i; + out: kfree(abspam); return retval;
| |