patch-2.4.0-test3 linux/drivers/video/igafb.c

• Lines: 33
• Date: Wed Jul 5 22:15:25 2000
• Orig file: v2.4.0-test2/linux/drivers/video/igafb.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/video/igafb.c linux/drivers/video/igafb.c
@@ -356,7 +356,7 @@
 	pci_outb(info, green, DAC_DATA);
 	pci_outb(info, blue,  DAC_DATA);
 
-	if (regno < 16)
+	if (regno < 16) {
 		switch (default_var.bits_per_pixel) {
 #ifdef FBCON_HAS_CFB16
 		case 16:
@@ -372,11 +372,14 @@
 #endif
 #ifdef FBCON_HAS_CFB32
 		case 32:
+			{ int i;
 			i = (regno << 8) | regno;
 			info->fbcon_cmap.cfb32[regno] = (i << 16) | i;
+			}
 			break;
 #endif
 		}
+	}
 	return 0;
 }
 
@@ -510,6 +513,8 @@
                 break;
 #endif
         default:
+		printk(KERN_WARNING "igafb_set_disp: unknown resolution %d\n",
+		    default_var.bits_per_pixel);
                 return;
         }
         memcpy(&info->dispsw, sw, sizeof(*sw));