patch-2.3.14 linux/drivers/video/acornfb.c

• Lines: 44
• Date: Thu Aug 12 10:22:33 1999
• Orig file: v2.3.13/linux/drivers/video/acornfb.c
• Orig date: Mon Aug 9 14:59:23 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/video/acornfb.c linux/drivers/video/acornfb.c
@@ -1728,14 +1728,14 @@
 	{ NULL, NULL }
 };
 
-void __init 
-acornfb_setup(char *options, int *ints)
+int __init 
+acornfb_setup(char *options)
 {
 	struct options *optp;
 	char *opt;
 
 	if (!options || !*options)
-		return;
+		return 0;
 
 	acornfb_init_fbinfo();
 
@@ -1759,6 +1759,7 @@
 			printk(KERN_ERR "acornfb: unknown parameter: %s\n",
 			       opt);
 	}
+	return 0;
 }
 
 /*
@@ -1802,7 +1803,7 @@
 	printk("acornfb: freed %dK memory\n", mb_freed);
 }
 
-void __init 
+int __init 
 acornfb_init(void)
 {
 	unsigned long size;
@@ -1904,5 +1905,7 @@
 		VIDC_NAME, init_var.xres, init_var.yres,
 		h_sync / 1000, h_sync % 1000, v_sync);
 
-	register_framebuffer(&fb_info);
+	if (register_framebuffer(&fb_info) < 0)
+		return -EINVAL;
+	return 0;
 }