Re: 2.6.10-rc2 on VAIO laptop and PowerMac 8500/G3

[Russell King <rmk+lkml@arm.linux.org.uk>]

On Thu, Dec 02, 2004 at 12:51:22AM -0800, John Mock wrote:
> A second crash involving software suspend looks
> like it might be 'UART' related, but i'm not sure if i can reproduce that
> one easily (as i'm not running that kernel).

Please try this patch.

--- linux-2.6-serial/drivers/serial/serial_core.c	Wed Dec  1 10:41:10 2004
+++ linux/drivers/serial/serial_core.c	Thu Dec  2 13:34:47 2004
@@ -1877,7 +1877,21 @@
 	 * Re-enable the console device after suspending.
 	 */
 	if (uart_console(port)) {
-		uart_change_speed(state, NULL);
+		struct termios termios;
+
+		/*
+		 * First try to use the console cflag setting.
+		 */
+		memset(&termios, 0, sizeof(struct termios));
+		termios.c_cflag = port->cons->cflag;
+
+		/*
+		 * If that's unset, use the tty termios setting.
+		 */
+		if (state->info && state->info->tty && termios.c_cflag == 0)
+			termios = *state->info->tty->termios;
+
+		port->ops->set_termios(port, &termios, NULL);
 		console_start(port->cons);
 	}
 


-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core