From 52d9c5afcef348ba2dee8fab57858016687e1e61 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 1 May 2005 08:59:23 -0700 Subject: [PATCH] --- yaml --- r: 773 b: refs/heads/master c: 306958e8e8d150b3e8bf13f66f3a6e9be7ee75ff h: refs/heads/master i: 771: 1c4125cb0b4a84aa37036ba733288af27b217ab5 v: v3 --- [refs] | 2 +- trunk/drivers/video/console/fbcon.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8699b772cac0..00048b2d927e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f76be80d96f60adfc91f2acf22b146ce0e3072f +refs/heads/master: 306958e8e8d150b3e8bf13f66f3a6e9be7ee75ff diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c index 59e3b4b4e7e3..b209adbd508a 100644 --- a/trunk/drivers/video/console/fbcon.c +++ b/trunk/drivers/video/console/fbcon.c @@ -906,10 +906,13 @@ static void fbcon_init(struct vc_data *vc, int init) struct vc_data *svc = *default_mode; struct display *t, *p = &fb_display[vc->vc_num]; int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256; - int cap = info->flags; + int cap; if (info_idx == -1 || info == NULL) return; + + cap = info->flags; + if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || (info->fix.type == FB_TYPE_TEXT)) logo = 0;