diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2008-06-13 00:21:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 03:05:41 +0200 |
| commit | d2187ebd84c7dd13ef269e9600f4daebeb02816e (patch) | |
| tree | e13e3da10a86080038d42c4b34936c7ab3bf441e /drivers/char/keyboard.c | |
| parent | /proc/sysvipc/shm: fix 32-bit truncation of segment sizes (diff) | |
| download | linux-d2187ebd84c7dd13ef269e9600f4daebeb02816e.tar.xz linux-d2187ebd84c7dd13ef269e9600f4daebeb02816e.zip | |
console keyboard mapping broken by 04c71976
Several console keyboard maps are broken since
commit 04c71976500352d02f60616d2b960267d8c5fe24
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Oct 16 23:27:04 2007 -0700
unicode diacritics support
because that changeset made k_self consider the value as a latin1
character when in Unicode mode, which is wrong; k_self should still take
the console map into account.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/char/keyboard.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 7f7e798c1384..d9a0a53c842d 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -677,12 +677,7 @@ static void k_deadunicode(struct vc_data *vc, unsigned int value, char up_flag) static void k_self(struct vc_data *vc, unsigned char value, char up_flag) { - unsigned int uni; - if (kbd->kbdmode == VC_UNICODE) - uni = value; - else - uni = conv_8bit_to_uni(value); - k_unicode(vc, uni, up_flag); + k_unicode(vc, conv_8bit_to_uni(value), up_flag); } static void k_dead2(struct vc_data *vc, unsigned char value, char up_flag) |