a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: sh-sci: Fix module clock refcount for serial console.

Browse Source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2007-04-26 11:45:32 +09:00 committed by Paul Mundt
parent 1534a3b3dc
commit 005a336e71
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/serial/sh-sci.c
View File

@ -78,8 +78,10 @@ struct sci_port {
struct timer_list break_timer; struct timer_list break_timer;
int break_flag; int break_flag;
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
/* Port clock */ /* Port clock */
struct clk *clk; struct clk *clk;
#endif
}; };
#ifdef CONFIG_SH_KGDB #ifdef CONFIG_SH_KGDB
@ -958,7 +960,9 @@ static int sci_startup(struct uart_port *port)
if (s->enable) if (s->enable)
s->enable(port); s->enable(port);
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
s->clk = clk_get(NULL, "module_clk"); s->clk = clk_get(NULL, "module_clk");
#endif
sci_request_irq(s); sci_request_irq(s);
sci_start_tx(port); sci_start_tx(port);
@ -978,8 +982,10 @@ static void sci_shutdown(struct uart_port *port)
if (s->disable) if (s->disable)
s->disable(port); s->disable(port);
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
clk_put(s->clk); clk_put(s->clk);
s->clk = NULL; s->clk = NULL;
#endif
} }
static void sci_set_termios(struct uart_port *port, struct ktermios *termios, static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
@ -1231,6 +1237,11 @@ static int __init serial_console_setup(struct console *co, char *options)
port->type = serial_console_port->type; port->type = serial_console_port->type;
#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
if (!serial_console_port->clk)
serial_console_port->clk = clk_get(NULL, "module_clk");
#endif
if (port->flags & UPF_IOREMAP) if (port->flags & UPF_IOREMAP)
sci_config_port(port, 0); sci_config_port(port, 0);