patch-2.2.3 linux/drivers/video/fbcon-cfb32.c

• Lines: 15
• Date: Thu Feb 25 10:02:12 1999
• Orig file: v2.2.2/linux/drivers/video/fbcon-cfb32.c
• Orig date: Mon Oct 5 13:13:41 1998

diff -u --recursive --new-file v2.2.2/linux/drivers/video/fbcon-cfb32.c linux/drivers/video/fbcon-cfb32.c
@@ -163,11 +163,11 @@
     u32 eorx, fgx, bgx;
 
     dest0 = p->screen_base + yy * fontheight(p) * bytes + xx * fontwidth(p) * 4;
-    fgx = ((u32 *)p->dispsw_data)[attr_fgcol(p, *s)];
-    bgx = ((u32 *)p->dispsw_data)[attr_bgcol(p, *s)];
+    fgx = ((u32 *)p->dispsw_data)[attr_fgcol(p, scr_readw(s))];
+    bgx = ((u32 *)p->dispsw_data)[attr_bgcol(p, scr_readw(s))];
     eorx = fgx ^ bgx;
     while (count--) {
-	c = *s++ & p->charmask;
+	c = scr_readw(s++) & p->charmask;
 	if (fontwidth(p) <= 8)
 	    cdat = p->fontdata + c * fontheight(p);
 	else