summaryrefslogtreecommitdiffstats
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorSonic Zhang <Sonic.Zhang@analog.com>2009-08-07 00:58:11 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-08 18:27:37 +0200
commit42c2c8c854a716b05882a122632ddcd6dbe108f1 (patch)
tree982192ec05b5be92a33f52c6e145cfafcdb43395 /kernel/printk.c
parentprintk: Restore previous console_loglevel when re-enabling logging (diff)
downloadlinux-42c2c8c854a716b05882a122632ddcd6dbe108f1.tar.xz
linux-42c2c8c854a716b05882a122632ddcd6dbe108f1.zip
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>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c2
1 files changed, 1 insertions, 1 deletions
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;