diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 21:35:17 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-02 21:35:17 -0400 |
commit | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (patch) | |
tree | 90db2ff7ccb35a8fdcf98366e6404afe1f845bc4 /drivers/char | |
parent | b326b853dca2f410b254198ee89abad71a2f4668 (diff) | |
parent | 0d87c7228a49e8342d60dd552892e470e0b291fa (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/char')
-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) | |||
1315 | if (test_bit(EV_SND, dev->evbit)) | 1315 | if (test_bit(EV_SND, dev->evbit)) |
1316 | return true; | 1316 | return true; |
1317 | 1317 | ||
1318 | if (test_bit(EV_KEY, dev->evbit)) | 1318 | if (test_bit(EV_KEY, dev->evbit)) { |
1319 | for (i = KEY_RESERVED; i < BTN_MISC; i++) | 1319 | for (i = KEY_RESERVED; i < BTN_MISC; i++) |
1320 | if (test_bit(i, dev->keybit)) | 1320 | if (test_bit(i, dev->keybit)) |
1321 | return true; | 1321 | return true; |
1322 | for (i = KEY_BRL_DOT1; i <= KEY_BRL_DOT10; i++) | ||
1323 | if (test_bit(i, dev->keybit)) | ||
1324 | return true; | ||
1325 | } | ||
1322 | 1326 | ||
1323 | return false; | 1327 | return false; |
1324 | } | 1328 | } |