summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Leach <matthew.leach@codethink.co.uk>2016-06-21 18:19:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-26 00:05:13 +0300
commitd03516df837587368fc6e75591f6329c072b9eb5 (patch)
treef55753ff800b9b6bf8d6e7fff7605770221ed711
parentbbb5ff91225dfbf3e5c27619552e41661048ed61 (diff)
downloadlinux-d03516df837587368fc6e75591f6329c072b9eb5.tar.xz
tty: serial: 8250: add CON_CONSDEV to flags
When using the 8250 as a boot console and the main console results in messages being printed twice. The console framework will only unregister boot consoles if a new console is registered with the CON_CONSDEV flag set. Set this flag for the univ8250 console to prevent double-registration. Signed-off-by: Matthew Leach <matthew.leach@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index fa823a54cf35..dcf43f66404f 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -675,7 +675,7 @@ static struct console univ8250_console = {
.device = uart_console_device,
.setup = univ8250_console_setup,
.match = univ8250_console_match,
- .flags = CON_PRINTBUFFER | CON_ANYTIME,
+ .flags = CON_PRINTBUFFER | CON_ANYTIME | CON_CONSDEV,
.index = -1,
.data = &serial8250_reg,
};