patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / video / console / mdacon.c

diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 8e30b24..8f7f3a7 100644 (file)
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -370,8 +370,6 @@ static void mdacon_init(struct vc_data *c, int init)
 
        if (mda_display_fg == NULL)
                mda_display_fg = c;
-
-       MOD_INC_USE_COUNT;
 }
 
 static void mdacon_deinit(struct vc_data *c)
@@ -380,8 +378,6 @@ static void mdacon_deinit(struct vc_data *c)
 
        if (mda_display_fg == c)
                mda_display_fg = NULL;
-
-       MOD_DEC_USE_COUNT;
 }
 
 static inline u16 mda_convert_attr(u16 ch)
@@ -586,6 +582,7 @@ static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines)
  */
 
 const struct consw mda_con = {
+       .owner =                THIS_MODULE,
        .con_startup =          mdacon_startup,
        .con_init =             mdacon_init,
        .con_deinit =           mdacon_deinit,
@@ -609,8 +606,7 @@ int __init mda_console_init(void)
        if (mda_first_vc > mda_last_vc)
                return 1;
 
-       take_over_console(&mda_con, mda_first_vc-1, mda_last_vc-1, 0);
-       return 0;
+       return take_over_console(&mda_con, mda_first_vc-1, mda_last_vc-1, 0);
 }
 
 void __exit mda_console_exit(void)