diff --git a/[refs] b/[refs]
index 17b3d1daafd0..6600658bfe55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6123f1192b610c3d8520eb7bb49f68ff7ca94b80
+refs/heads/master: 86809173ce32ef03bd4d0389dfc72df0c805e9c4
diff --git a/trunk/drivers/input/matrix-keymap.c b/trunk/drivers/input/matrix-keymap.c
index db92c1ebfc59..443ad64b7f2a 100644
--- a/trunk/drivers/input/matrix-keymap.c
+++ b/trunk/drivers/input/matrix-keymap.c
@@ -29,7 +29,7 @@ static bool matrix_keypad_map_key(struct input_dev *input_dev,
 				  unsigned int rows, unsigned int cols,
 				  unsigned int row_shift, unsigned int key)
 {
-	unsigned char *keymap = input_dev->keycode;
+	unsigned short *keymap = input_dev->keycode;
 	unsigned int row = KEY_ROW(key);
 	unsigned int col = KEY_COL(key);
 	unsigned short code = KEY_VAL(key);