From 2eef6c015052427b17bfa22a4448988b516a8330 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Mon, 12 Oct 2020 09:05:09 +0200 Subject: [PATCH] parisc/sticon: Always register sticon console driver If the ROM provides functional STI routines, always register the sticon driver, even if the serial console was choosen as boot device. Additionally, in that case, do not make the sticon driver the default output console device. Signed-off-by: Helge Deller --- drivers/video/console/sticon.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c index e7fd995d3aea3..7c1dcd5266007 100644 --- a/drivers/video/console/sticon.c +++ b/drivers/video/console/sticon.c @@ -348,14 +348,13 @@ static int __init sticonsole_init(void) if (!sticon_sti) return -ENODEV; - if (conswitchp == &dummy_con) { - printk(KERN_INFO "sticon: Initializing STI text console.\n"); - console_lock(); - err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1); - console_unlock(); - return err; - } - return 0; + pr_info("sticon: Initializing STI text console.\n"); + console_lock(); + err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, + PAGE0->mem_cons.cl_class != CL_DUPLEX); + console_unlock(); + + return err; } module_init(sticonsole_init); -- 2.39.5