Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv8328/linux/drivers/video
Modified Files:
anakinfb.c neofb.c
Log Message:
Synced to 2.5.9. Note some of the fb changes went into 2.5.9. Yeah :-)
Index: anakinfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/anakinfb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- anakinfb.c 16 Apr 2002 17:51:55 -0000 1.1
+++ anakinfb.c 24 Apr 2002 18:56:51 -0000 1.2
@@ -78,10 +78,18 @@
fb_info.fbops = &anakinfb_ops;
fb_info.var = anakinfb_var;
fb_info.fix = anakinfb_fix;
- fb_info.screen_base = ioremap(VGA_START, VGA_SIZE);
- if (register_framebuffer(&fb_info) < 0)
+ if (!(request_mem_region(VGA_START, VGA_SIZE, "vga")))
+ return -ENOMEM;
+ if (!(fb_info.screen_base = ioremap(VGA_START, VGA_SIZE))) {
+ release_mem_region(VGA_START, VGA_SIZE);
+ return -EIO;
+ }
+ if (register_framebuffer(&fb_info) < 0) {
+ iounmap(fb_info.screen_base);
+ release_mem_region(VGA_START, VGA_SIZE);
return -EINVAL;
+ }
MOD_INC_USE_COUNT;
return 0;
Index: neofb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/neofb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- neofb.c 24 Mar 2002 14:48:54 -0000 1.2
+++ neofb.c 24 Apr 2002 18:56:51 -0000 1.3
@@ -75,10 +75,10 @@
/* --------------------------------------------------------------------- */
-static int disabled = 0;
-static int internal = 0;
-static int external = 0;
-static int nostretch = 0;
+static int disabled = 0;
+static int internal = 0;
+static int external = 0;
+static int nostretch = 0;
[...3422 lines suppressed...]
+ DBG("init_module");
- if (disabled)
- return -ENXIO;
+ if (disabled)
+ return -ENXIO;
- neo_init();
+ neo_init();
- /* never return failure; user can hotplug card later... */
- return 0;
+ /* never return failure; user can hotplug card later... */
+ return 0;
}
-#endif /* MODULE */
+#endif /* MODULE */
module_exit(neo_done);
|
