From: Sonic Zhang <Sonic.Zhang@analog.com>
Date: Thu, 6 Aug 2009 22:58:11 +0000 (-0700)
Subject: printk: Fix "printk: Enable the use of more than one CON_BOOT (early console)"
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=42c2c8c854a716b05882a122632ddcd6dbe108f1;p=deliverable%2Flinux.git

printk: Fix "printk: Enable the use of more than one CON_BOOT (early console)"

Don't return when we find the first bootconsole - it can leave
other bootconsoles still installed, and they can be used and
cause problems later (if they are in the init section, and
eventually released), and cause problems.  Make sure we remove
all of them.

Signed-off-by: Sonic Zhang <Sonic.Zhang@analog.com>
Signed-off-by: Robin Getz <rgetz@analog.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/printk.c b/kernel/printk.c
index e0daaf57985a..e10d193a833a 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1352,7 +1352,7 @@ static int __init disable_boot_consoles(void)
 		if (con->flags & CON_BOOT) {
 			printk(KERN_INFO "turn off boot console %s%d\n",
 				con->name, con->index);
-			return unregister_console(con);
+			unregister_console(con);
 		}
 	}
 	return 0;