From: Kenneth Waters <kwwaters@gmail.com>
Date: Tue, 21 Sep 2010 07:58:23 +0000 (-0700)
Subject: Input: joydev - fix JSIOCSAXMAP ioctl
X-Git-Tag: v2.6.34.8~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a182c5219f8ab1fffd3947b57999f10f8852ca2b;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 423e0e6031ab5..03254804d3d58 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;