diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-05-21 16:16:55 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-05-21 16:16:55 +0200 |
| commit | cf799c23f7032f42ccdc7c5de9c12b14a22e6843 (patch) | |
| tree | b99ea9f584da77deff4711fb13111d8f54bcb290 | |
| parent | 54e824f5b130baabc9e202a08170a6d0d2fc3bdd (diff) | |
fixupfbcon-fixup
| -rw-r--r-- | drivers/video/fbdev/core/fbcon.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index a1be589b692f..588f876055db 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1062,9 +1062,13 @@ static void fbcon_init(struct vc_data *vc, int init) int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256; int cap, ret; - if (info_idx == -1 || info == NULL) + if (WARN_ON(info_idx == -1)) return; + if (con2fb_map[vc->vc_num] == -1) + con2fb_map[vc->vc_num] = info_idx; + + info = registered_fb[con2fb_map[vc->vc_num]]; cap = info->flags; if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) |