diff --git a/[refs] b/[refs]
index 186b72d76f2f..5c08f120eaed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38e7afe96c7c0ad900824911c61fdb04078033dc
+refs/heads/master: d2520a426dc3033c00077e923a553fc6c98c7564
diff --git a/trunk/drivers/input/joydev.c b/trunk/drivers/input/joydev.c
index d85bd8a7967d..22239e988498 100644
--- a/trunk/drivers/input/joydev.c
+++ b/trunk/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;