diff options
| author | Dmitry Torokhov <[email protected]> | 2010-08-03 01:35:17 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2010-08-03 01:35:17 +0000 |
| commit | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch) | |
| tree | 90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /drivers/char/keyboard.c | |
| parent | Input: xpad - add product ID for Hori Fighting Stick EX2 (diff) | |
| parent | Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add() (diff) | |
| download | kernel-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.tar.gz kernel-d01d0756f75e7a5b4b43764ad45b83c4340f11d6.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/char/keyboard.c')
| -rw-r--r-- | drivers/char/keyboard.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 54109dc9240c..25be2102a60a 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -1315,10 +1315,14 @@ static bool kbd_match(struct input_handler *handler, struct input_dev *dev) if (test_bit(EV_SND, dev->evbit)) return true; - if (test_bit(EV_KEY, dev->evbit)) + if (test_bit(EV_KEY, dev->evbit)) { for (i = KEY_RESERVED; i < BTN_MISC; i++) if (test_bit(i, dev->keybit)) return true; + for (i = KEY_BRL_DOT1; i <= KEY_BRL_DOT10; i++) + if (test_bit(i, dev->keybit)) + return true; + } return false; } |