diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 16:59:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 16:59:51 -0500 |
| commit | ff961c68b140fc99946b94b7dbed8cd1f1333ff4 (patch) | |
| tree | b2b8bcc693231e9437a6b25edd3490ff41154851 | |
| parent | 432983d2618b8b240657bc17d2e493b1a1a47af0 (diff) | |
| parent | 46a965462a1c568a7cd7dc338de4a0afa5ce61c5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: keyboard - fix braille keyboard keysym generation
| -rw-r--r-- | drivers/char/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 737be953cc58..950837cf9e9c 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c | |||
| @@ -1249,7 +1249,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) | |||
| 1249 | 1249 | ||
| 1250 | if (keycode >= NR_KEYS) | 1250 | if (keycode >= NR_KEYS) |
| 1251 | if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8) | 1251 | if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8) |
| 1252 | keysym = K(KT_BRL, keycode - KEY_BRL_DOT1 + 1); | 1252 | keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1)); |
| 1253 | else | 1253 | else |
| 1254 | return; | 1254 | return; |
| 1255 | else | 1255 | else |