[PATCH] fbcon: Fix module ref counting

[PATCH] fbcon: Fix module ref counting

[Antonino A. Daplas]

fbcon may decrement the module ref count of drivers to < 0 when unloading.
This is because fbcon_exit() is called more than once (once on unbind, and
another on module unload).

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

 drivers/video/console/fbcon.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 6e813a1..5dc4083 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1213,7 +1213,7 @@ static void fbcon_deinit(struct vc_data 
 	ops->flags &= ~FBCON_FLAGS_INIT;
 finished:
 
-	if (!con_is_bound(&fb_con) && !fbcon_has_exited)
+	if (!con_is_bound(&fb_con))
 		fbcon_exit();
 
 	return;
@@ -3195,6 +3195,9 @@ static void fbcon_exit(void)
 	struct fb_info *info;
 	int i, j, mapped;
 
+	if (fbcon_has_exited)
+		return;
+
 #ifdef CONFIG_ATARI
 	free_irq(IRQ_AUTO_4, fbcon_vbl_handler);
 #endif


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642