USB: usbmon: fix bug in mon_buff_area_shrink

[safe/jmp/linux-2.6] / drivers / video / console / fbcon.c

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 4bee7c2..3681c6a 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -114,6 +114,7 @@ static int last_fb_vc = MAX_NR_CONSOLES - 1;
 static int fbcon_is_default = 1; 
 static int fbcon_has_exited;
 static int primary_device = -1;
+static int fbcon_has_console_bind;
 
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 static int map_override;
@@ -544,6 +545,8 @@ static int fbcon_takeover(int show_logo)
                        con2fb_map[i] = -1;
                }
                info_idx = -1;
+       } else {
+               fbcon_has_console_bind = 1;
        }
 
        return err;
@@ -2308,14 +2311,11 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
                ops->graphics = 1;
 
                if (!blank) {
-                       if (info->fbops->fb_save_state)
-                               info->fbops->fb_save_state(info);
                        var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE;
                        fb_set_var(info, &var);
                        ops->graphics = 0;
                        ops->var = info->var;
-               } else if (info->fbops->fb_restore_state)
-                       info->fbops->fb_restore_state(info);
+               }
        }
 
        if (!fbcon_is_inactive(vc, info)) {
@@ -2949,6 +2949,10 @@ static int fbcon_unbind(void)
 
        ret = unbind_con_driver(&fb_con, first_fb_vc, last_fb_vc,
                                fbcon_is_default);
+
+       if (!ret)
+               fbcon_has_console_bind = 0;
+
        return ret;
 }
 #else
@@ -2962,6 +2966,9 @@ static int fbcon_fb_unbind(int idx)
 {
        int i, new_idx = -1, ret = 0;
 
+       if (!fbcon_has_console_bind)
+               return 0;
+
        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                if (con2fb_map[i] != idx &&
                    con2fb_map[i] != -1) {