diff --git a/[refs] b/[refs]
index 797cc50274bb..7ce0932e48ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c826818ff55eae7702b778b5f8bdf765af3b2af
+refs/heads/master: d2187ebd84c7dd13ef269e9600f4daebeb02816e
diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c
index 7f7e798c1384..d9a0a53c842d 100644
--- a/trunk/drivers/char/keyboard.c
+++ b/trunk/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)