Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 773
b: refs/heads/master
c: 306958e
h: refs/heads/master
i:
  771: 1c4125c
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed May 1, 2005
1 parent 4e005f5 commit 52d9c5a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f76be80d96f60adfc91f2acf22b146ce0e3072f
refs/heads/master: 306958e8e8d150b3e8bf13f66f3a6e9be7ee75ff
5 changes: 4 additions & 1 deletion trunk/drivers/video/console/fbcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 52d9c5a

Please sign in to comment.