tizen 2.4 release

[kernel/linux-3.0.git] / drivers / tty / vt / consolemap.c

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index f343808..349d165 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -21,6 +21,7 @@
 #include <asm/uaccess.h>
 #include <linux/consolemap.h>
 #include <linux/vt_kern.h>
+#include <linux/delay.h>
 
 static unsigned short translations[][256] = {
   /* 8-bit Latin-1 mapped to Unicode -- trivial mapping */
@@ -477,6 +478,10 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
        if (!(p2 = p1[n = (unicode >> 6) & 0x1f])) {
                p2 = p1[n] = kmalloc(64*sizeof(u16), GFP_KERNEL);
                if (!p2) return -ENOMEM;
+
+               /* WORKAROUND: This delay time prevent NULL point error. */
+               udelay(1);
+
                memset(p2, 0xff, 64*sizeof(u16)); /* No glyphs for the characters (yet) */
        }