summaryrefslogtreecommitdiff
path: root/drivers/input/misc/gpio_matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/misc/gpio_matrix.c')
-rw-r--r--drivers/input/misc/gpio_matrix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/misc/gpio_matrix.c b/drivers/input/misc/gpio_matrix.c
index 441cc1ce1ab..10b44110166 100644
--- a/drivers/input/misc/gpio_matrix.c
+++ b/drivers/input/misc/gpio_matrix.c
@@ -316,9 +316,8 @@ int gpio_event_matrix_func(struct input_dev *input_dev,
kp->keypad_info = mi;
set_bit(EV_KEY, input_dev->evbit);
for (i = 0; i < key_count; i++) {
- if (mi->keymap[i])
- set_bit(mi->keymap[i] & KEY_MAX,
- input_dev->keybit);
+ if (mi->keymap[i] && mi->keymap[i] <= KEY_MAX)
+ set_bit(mi->keymap[i], input_dev->keybit);
}
for (i = 0; i < mi->noutputs; i++) {