|
@@ -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;
|
|
@@ -2949,6 +2952,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 +2969,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) {
|