diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 01:10:20 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 01:12:20 -0700 |
| commit | 86809173ce32ef03bd4d0389dfc72df0c805e9c4 (patch) | |
| tree | ff003530a58eff45d770827dfae71e6d6c730473 /drivers/input/matrix-keymap.c | |
| parent | 6123f1192b610c3d8520eb7bb49f68ff7ca94b80 (diff) | |
| download | linux-3.10-86809173ce32ef03bd4d0389dfc72df0c805e9c4.tar.gz linux-3.10-86809173ce32ef03bd4d0389dfc72df0c805e9c4.tar.bz2 linux-3.10-86809173ce32ef03bd4d0389dfc72df0c805e9c4.zip | |
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/matrix-keymap.c')
| -rw-r--r-- | drivers/input/matrix-keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c index db92c1ebfc5..443ad64b7f2 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, 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); |