patch-2.1.125 linux/drivers/video/fbcon.c

Next file: linux/drivers/video/mdacon.c
Previous file: linux/drivers/video/atafb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.124/linux/drivers/video/fbcon.c linux/drivers/video/fbcon.c
@@ -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

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov