Thread (4 messages) 4 messages, 3 authors, 2004-02-21

fb_console_init fix.

From: James Simmons <hidden>
Date: 2004-02-20 21:58:10
Also in: lkml

Hi!

  This patch fixes fb_console_init from being called twice. I still need 
to fix set_con2fb but this helps but this is still important to get in.
--- linus-2.6/drivers/video/console/fbcon.c	2004-02-18 20:59:11.000000000 -0800
+++ fbdev-2.6/drivers/video/console/fbcon.c	2004-02-19 18:14:52.000000000 -0800
@@ -2335,6 +2335,7 @@
 {
 	if (!num_registered_fb)
 		return -ENODEV;
+
 	take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default);
 	acquire_console_sem();
 	if (!fbcon_event_notifier_registered) {
@@ -2342,10 +2343,11 @@
 		fbcon_event_notifier_registered = 1;
 	} 
 	release_console_sem();
-
 	return 0;
 }
 
+#ifdef MODULE
+
 void __exit fb_console_exit(void)
 {
 	acquire_console_sem();
@@ -2360,6 +2362,8 @@
 module_init(fb_console_init);
 module_exit(fb_console_exit);
 
+#endif
+
 /*
  *  Visible symbols for modules
  */



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help