parisc/sticon: Always register sticon console driver (58a5c67a) · Commits · 戴 / test

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>

drivers/video/console/sticon.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -348,15 +348,14 @@ static int __init sticonsole_init(void)
		if (!sticon_sti)
		return -ENODEV;

		if (conswitchp == &dummy_con) {
		printk(KERN_INFO "sticon: Initializing STI text console.\n");
		pr_info("sticon: Initializing STI text console.\n");
		console_lock();
		err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1, 1);
		err = do_take_over_console(&sti_con, 0, MAX_NR_CONSOLES - 1,
		PAGE0->mem_cons.cl_class != CL_DUPLEX);
		console_unlock();

		return err;
		}
		return 0;
		}

		module_init(sticonsole_init);
		MODULE_LICENSE("GPL");

Admin message