leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: sh-sci: Fix double initialization by serial_console_setup

Browse Source 
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>
This commit is contained in:
Nobuhiro Iwamatsu 2011-03-24 02:20:56 +00:00 committed by Paul Mundt
parent b2267a6b09
commit 6a8c979935
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/tty/serial/sh-sci.c
View File

@ -1872,13 +1872,6 @@ static struct console serial_console = {
.data = &sci_uart_driver, .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 = { static struct console early_serial_console = {
.name = "early_ttySC", .name = "early_ttySC",
.write = serial_console_write, .write = serial_console_write,
@ -1907,18 +1900,18 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
register_console(&early_serial_console); register_console(&early_serial_console);
return 0; return 0;
} }
#define SCI_CONSOLE (&serial_console)
#else #else
static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev) static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
{ {
return -EINVAL; return -EINVAL;
} }
#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) #define SCI_CONSOLE NULL
#define SCI_CONSOLE (&serial_console)
#else #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
#define SCI_CONSOLE 0
#endif
static char banner[] __initdata = static char banner[] __initdata =
KERN_INFO "SuperH SCI(F) driver initialized\n"; KERN_INFO "SuperH SCI(F) driver initialized\n";