aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonic Zhang <[email protected]>2009-08-06 15:58:11 -0700
committerIngo Molnar <[email protected]>2009-08-08 18:27:37 +0200
commit42c2c8c854a716b05882a122632ddcd6dbe108f1 (patch)
tree982192ec05b5be92a33f52c6e145cfafcdb43395
parent1aaad49e856ce41adc07d8ae0c8ef35fc4483245 (diff)
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 <[email protected]> Signed-off-by: Robin Getz <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
-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;