diff options
| author |   Helge Deller <deller@gmx.de> | 2020-10-12 09:05:09 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2020-10-15 08:10:39 +0200 |
| commit | 58a5c67aadde68d0d31c36adbabdec28c25bb6ab (patch) | |
| tree | 6597adcca3fd344265621f018ad8e496cbae832b | |
| parent | parisc: Add MAP_UNINITIALIZED define (diff) | |
| download | linux-dev-58a5c67aadde68d0d31c36adbabdec28c25bb6ab.tar.xz linux-dev-58a5c67aadde68d0d31c36adbabdec28c25bb6ab.zip | |
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 <deller@gmx.de>
| -rw-r--r-- | drivers/video/console/sticon.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c index e7fd995d3aea..7c1dcd526600 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); |