Re: [PATCH] console keyboard mapping broken by 04c71976

[Samuel Thibault <samuel.thibault@ens-lyon.org>]

Andrew Morton, le Wed 11 Jun 2008 18:27:06 -0700, a écrit :
> Is this ready to be applied?  If so, please send a changelog.

Ah, right, there was no changelog.



From: Jiri Bohac <jbohac@suse.cz>

Several console keyboard maps are broken since 04c71976, 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>

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 7f7e798..16492b7 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -678,10 +678,5 @@
 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);
 }