From cd24f552d9a70008e00fde08cc3a2da37e65623d Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 25 Sep 2006 23:32:57 -0700 Subject: [PATCH] --- yaml --- r: 35693 b: refs/heads/master c: e1da95ae38afdcda83328300c4aed755d9fc01a6 h: refs/heads/master i: 35691: a77f4af8e3659dc930601f470d8db4458a86ce32 v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4e234150001f..9c9639f51722 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8eb8b4025175f967af0ba8e933f23aa9954dc35 +refs/heads/master: e1da95ae38afdcda83328300c4aed755d9fc01a6 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index 372e47f7d596..5f7ba1adb309 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -1929,6 +1929,13 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port) mutex_lock(&state->mutex); +#ifdef CONFIG_DISABLE_CONSOLE_SUSPEND + if (uart_console(port)) { + mutex_unlock(&state->mutex); + return 0; + } +#endif + if (state->info && state->info->flags & UIF_INITIALIZED) { const struct uart_ops *ops = port->ops; @@ -1967,6 +1974,13 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) mutex_lock(&state->mutex); +#ifdef CONFIG_DISABLE_CONSOLE_SUSPEND + if (uart_console(port)) { + mutex_unlock(&state->mutex); + return 0; + } +#endif + uart_change_pm(state, 0); /*