patch-2.2.18 linux/drivers/video/fbcon-mac.c

• Lines: 19
• Date: Fri Oct 13 23:52:23 2000
• Orig file: v2.2.17/drivers/video/fbcon-mac.c
• Orig date: Fri Apr 21 12:46:39 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/video/fbcon-mac.c linux/drivers/video/fbcon-mac.c
@@ -331,7 +331,8 @@
   u16 *dest16, pix16;
   u32 *dest32, pix32;
 
-  if (pixel_x < 0 || pixel_y < 0 || pixel_x >= 832 || pixel_y >= 624) {
+  /* There *are* 68k Macs that support more than 832x624, you know :-) */
+  if (pixel_x < 0 || pixel_y < 0 || pixel_x >= p->var.xres || pixel_y >= p->var.yres) {
     int cnt;
     printk ("ERROR: pixel_x == %d, pixel_y == %d", pixel_x, pixel_y);
     for(cnt = 0; cnt < 100000; cnt++)
@@ -455,7 +456,7 @@
   u8 *dest, bit;
   u16 *dest16;
   u32 *dest32;
-  u8 pixel;
+  u8 pixel = 0x5a;
 
   switch (p->var.bits_per_pixel) {
   case 1: