Messages in this thread Patch in this message | | | Date | Wed, 13 Oct 2010 14:58:06 +0900 | From | MyungJoo Ham <> | Subject | [PATCH] Serial: BUGFIX: uart_resume_port has an omitted condition. |
| |
When console_suspend_enabled == 0, console_stop() was not called at suspend; thus, it does not need to call console_start() when resume. Besides, calling console_start() without calling console_stop() before had been incurring kernel hang with console_suspend_enabled == 0 in a machine with drivers/serial/samsung.c and s5pc210.
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- drivers/serial/serial_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index cd85112..ff21200 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c @@ -2065,7 +2065,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) /* * Re-enable the console device after suspending. */ - if (uart_console(uport)) { + if (console_suspend_enabled && uart_console(uport)) { uart_change_pm(state, 0); uport->ops->set_termios(uport, &termios, NULL); console_start(uport->cons); -- 1.6.3.3
| |