silence fbcon logo

Bugzilla: N/A
Upstream-status: Fedora mustard

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 1aaf89300621abc811f57f549c25b9a540a21d99..cc6777df6ff4b61e4ba2e0a5749f927ff5c01d8b 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
                kfree(save);
        }
 
-       if (logo_lines > vc->vc_bottom) {
-               logo_shown = FBCON_LOGO_CANSHOW;
-               printk(KERN_INFO
-                      "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
-       } else if (logo_shown != FBCON_LOGO_DONTSHOW) {
-               logo_shown = FBCON_LOGO_DRAW;
-               vc->vc_top = logo_lines;
+       if (logo_shown != FBCON_LOGO_DONTSHOW) {
+               if (logo_lines > vc->vc_bottom) {
+                       logo_shown = FBCON_LOGO_CANSHOW;
+                       printk(KERN_INFO
+                              "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
+               } else {
+                       logo_shown = FBCON_LOGO_DRAW;
+                       vc->vc_top = logo_lines;
+               }
        }
 }
 #endif /* MODULE */
@@ -3622,6 +3624,14 @@ static int __init fb_console_init(void)
        return 0;
 }
 
+static int __init quiet_logo(char *str)
+{
+       logo_shown = FBCON_LOGO_DONTSHOW;
+       return 0;
+}
+
+early_param("quiet", quiet_logo);
+
 fs_initcall(fb_console_init);
 
 #ifdef MODULE