diff options
| author | Nobuhiro Iwamatsu | 2011-03-24 03:20:56 +0100 |
|---|---|---|
| committer | Paul Mundt | 2011-03-31 07:33:24 +0200 |
| commit | 6a8c979935f1955707fe79909cb3baf9575282f4 (patch) | |
| tree | 2b05cffbdf8e5bcc3c47bb5f4f1f2cac36ec5374 /drivers/tty | |
| parent | serial: sh-sci: prevent setup of uninitialized serial console (diff) | |
| download | kernel-qcow2-linux-6a8c979935f1955707fe79909cb3baf9575282f4.tar.gz kernel-qcow2-linux-6a8c979935f1955707fe79909cb3baf9575282f4.tar.xz kernel-qcow2-linux-6a8c979935f1955707fe79909cb3baf9575282f4.zip | |
sh: sh-sci: Fix double initialization by serial_console_setup
The driver is initialized in a state with an unknown value by
serial_console_setup. And initialization fails.
This is caused by the initialization by sci_console_init.
This function does not seem to be necessary for the present sh-sci driver.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 264209c32675..4e530a58bb1d 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1872,13 +1872,6 @@ static struct console serial_console = { .data = &sci_uart_driver, }; -static int __init sci_console_init(void) -{ - register_console(&serial_console); - return 0; -} -console_initcall(sci_console_init); - static struct console early_serial_console = { .name = "early_ttySC", .write = serial_console_write, @@ -1907,18 +1900,18 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev) register_console(&early_serial_console); return 0; } + +#define SCI_CONSOLE (&serial_console) + #else static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev) { return -EINVAL; } -#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */ -#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) -#define SCI_CONSOLE (&serial_console) -#else -#define SCI_CONSOLE 0 -#endif +#define SCI_CONSOLE NULL + +#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */ static char banner[] __initdata = KERN_INFO "SuperH SCI(F) driver initialized\n"; |