Re: [PATCH] 8250: Don't restore NS16550 mode when console suspendis disabled

[Michał Mirosław]

On Tue, May 12, 2009 at 09:00:16PM +0000, Deepak Saxena wrote:
> Commit b5b82df6, from May 2007, breaks no_console_suspend on the OLPC 
> XO laptop. Basically what happens is that upon returning from resume, 
> serial8250_resume_port() will reconfigure the port for high speed
> mode and all console output will be garbled, making debug of the 
> resume path painful. This patch modifies serial8250_resume_port() to 
> not touch the port in the case where it is the console port and console 
> suspend is disabled.
[cut]
> --- a/drivers/serial/8250.c
> +++ b/drivers/serial/8250.c
> @@ -2887,7 +2887,8 @@ void serial8250_resume_port(int line)
>  {
>  	struct uart_8250_port *up = &serial8250_ports[line];
>  
> -	if (up->capabilities & UART_NATSEMI) {
> +	if ((up->capabilities & UART_NATSEMI) && 
> +	     (!uart_console(&up->port) && console_suspend_enabled)) {

Shouldn't this be || instead of && - as in: if it is NOT a console port
OR console suspend is enabled?

Best Regards,
Michał Mirosław

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/