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

Next file: linux/drivers/video/fbcon-vga-planes.c
Previous file: linux/drivers/video/cyberfb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/drivers/video/dnfb.c linux/drivers/video/dnfb.c
@@ -310,7 +310,7 @@
 #endif
 }
   
-void dnfb_init(void)
+int dnfb_init(void)
 {
 	fb_info.changevar=NULL;
 	strcpy(&fb_info.modename[0],dnfb_name);
@@ -333,11 +333,14 @@
         dnfb_get_var(&disp[0].var, 0, &fb_info);
 	dnfb_set_disp(-1, &fb_info);
 
-	if (register_framebuffer(&fb_info) < 0)
-		panic("unable to register apollo frame buffer\n");
+	if (register_framebuffer(&fb_info) < 0) {
+		printk(KERN_ERR "unable to register apollo frame buffer\n");
+		return -EINVAL;
+	}
  
         printk("fb%d: apollo frame buffer alive and kicking !\n",
 	       GET_FB_IDX(fb_info.node));
+	return 0;
 }	
 
 	

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)