aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 04:10:20 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 04:12:20 -0400
commit86809173ce32ef03bd4d0389dfc72df0c805e9c4 (patch)
treeff003530a58eff45d770827dfae71e6d6c730473 /drivers/input
parent6123f1192b610c3d8520eb7bb49f68ff7ca94b80 (diff)
Input: matrix-keymap - fix building keymaps
Keymaps used by drivers based on matrix-keymap facilities are arrays of unsigned shorts, not chars. Treating them otherwise produces corrupted keymaps. Reported-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/matrix-keymap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
index db92c1ebfc59..443ad64b7f2a 100644
--- a/drivers/input/matrix-keymap.c
+++ b/drivers/input/matrix-keymap.c
@@ -29,7 +29,7 @@ static bool matrix_keypad_map_key(struct input_dev *input_dev,
29 unsigned int rows, unsigned int cols, 29 unsigned int rows, unsigned int cols,
30 unsigned int row_shift, unsigned int key) 30 unsigned int row_shift, unsigned int key)
31{ 31{
32 unsigned char *keymap = input_dev->keycode; 32 unsigned short *keymap = input_dev->keycode;
33 unsigned int row = KEY_ROW(key); 33 unsigned int row = KEY_ROW(key);
34 unsigned int col = KEY_COL(key); 34 unsigned int col = KEY_COL(key);
35 unsigned short code = KEY_VAL(key); 35 unsigned short code = KEY_VAL(key);