Resent-Date: Wed, 7 Oct 1998 12:53:30 +0200 (MET DST)
To: linux-m68k@lists.linux-m68k.org
Subject: Bug in fbcon font support
X-Yow: I need "RONDO".
From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
Date: 07 Oct 1998 10:10:31 +0200
Resent-From: linux-m68k@phil.uni-sb.de

Hi!

This fixes a bug in fbcon_get_font: try "setfont -o foo; setfont foo" for
a laugh. :-)

Andreas.

--- linux/drivers/video/fbcon.c.~2~	Mon Oct  5 19:40:52 1998
+++ linux/drivers/video/fbcon.c	Mon Oct  5 19:42:12 1998
@@ -1251,6 +1251,7 @@
 	    for (j = 0; j < fontheight(p); j++)
 		*data++ = *fontdata++;
 	    memset(data, 0, 32-j);
+	    data += 32 - j;
 	}
     }
 #ifndef CONFIG_FBCON_FONTWIDTH8_ONLY
@@ -1262,6 +1263,7 @@
 		fontdata += sizeof(u16);
 	    }
 	    memset(data, 0, 2*(32-j));
+	    data += 2 * (32 - j);
 	}
     } else if (op->width <= 24) {
 	for (i = 0; i < op->charcount; i++) {
@@ -1272,6 +1274,7 @@
 		fontdata += sizeof(u32);
 	    }
 	    memset(data, 0, 3*(32-j));
+	    data += 3 * (32 - j);
 	}
     } else {
 	for (i = 0; i < op->charcount; i++) {
@@ -1283,6 +1286,7 @@
 		fontdata += sizeof(u32);
 	    }
 	    memset(data, 0, 4*(32-j));
+	    data += 4 * (32 - j);
 	}
     }
 #endif

-- 
Andreas Schwab                                      "And now for something
schwab@issan.informatik.uni-dortmund.de              completely different"
schwab@gnu.org