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

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

diff -u --recursive --new-file v2.2.2/linux/drivers/video/fbcon-cfb4.c linux/drivers/video/fbcon-cfb4.c
@@ -158,8 +158,8 @@
 	u32 eorx, fgx, bgx;
 
 	dest0 = p->screen_base + yy * fontheight(p) * bytes + xx * 4;
-	fgx=attr_fgcol(p,*s);
-	bgx=attr_bgcol(p,*s);
+	fgx=attr_fgcol(p,scr_readw(s));
+	bgx=attr_bgcol(p,scr_readw(s));
 	fgx |= (fgx << 4);
 	fgx |= (fgx << 8);
 	fgx |= (fgx << 16);
@@ -168,7 +168,7 @@
 	bgx |= (bgx << 16);
 	eorx = fgx ^ bgx;
 	while (count--) {
-		c = *s++ & p->charmask;
+		c = scr_readw(s++) & p->charmask;
 		cdat = p->fontdata + c * fontheight(p);
 
 		for (rows = fontheight(p), dest = dest0; rows-- ; dest += bytes) {