diff mbox series

parisc/sticon: Always register sticon console driver

Message ID 20201012071340.GA15080@ls3530.fritz.box (mailing list archive)
State Accepted, archived
Headers show
Series parisc/sticon: Always register sticon console driver | expand

Commit Message

Helge Deller Oct. 12, 2020, 7:13 a.m. UTC 
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 <deller@gmx.de>
diff mbox series

Patch

diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 21a5c280c8c9..8647d2b654b1 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -355,14 +355,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);