---

yaml --- r: 306627 b: refs/heads/master c: 8680917 h: refs/heads/master i: 306625: 259eb04 306623: cabd638 v: v3
git-mirror · May 24, 2012 · 4193521 · 4193521
1 parent cb4f97e
commit 4193521
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);