]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Input: joydev - fix JSIOCSAXMAP ioctl
authorKenneth Waters <kwwaters@gmail.com>
Tue, 21 Sep 2010 07:58:23 +0000 (00:58 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 29 Oct 2010 04:51:19 +0000 (21:51 -0700)
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

index 34157bb97ed6440695dcafb072ca3f8419cb5d0b..f5320b558c73a1ef830069b8c92b7cd0be4d8f18 100644 (file)
@@ -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;