diff --git a/[refs] b/[refs] index f6727720f38f..2eeef2a822c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42a17ad2762f465d291c3bc0b6ed2b3738f65481 +refs/heads/master: c0b7988200a82290287c6f4cd49585007f73175a diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index 2c1d133819b5..08151d4de489 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/drivers/char/vt.c @@ -2274,7 +2274,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co continue; /* nothing to display */ } /* Glyph not found */ - if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) { + if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) { /* In legacy mode use the glyph we get by a 1:1 mapping. This would make absolutely no sense with Unicode in mind, but do this for ASCII characters since a font may lack