From e0fe86e6eb805971a1d5019d870f5ed892546c2f Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 4 Feb 2008 22:27:53 -0800 Subject: [PATCH] --- yaml --- r: 83005 b: refs/heads/master c: 6d4d67beb963de8865499781b8523e5b683819c3 h: refs/heads/master i: 83003: a9978ea69b66fc81c298b0e08723b8cca50d507e v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9300fbfc394..67cc1fbd8a48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8c6bfa39d6bd7347f43937c8767ae145b61bcb4 +refs/heads/master: 6d4d67beb963de8865499781b8523e5b683819c3 diff --git a/trunk/drivers/serial/serial_core.c b/trunk/drivers/serial/serial_core.c index 304fe32eb066..276da148c57e 100644 --- a/trunk/drivers/serial/serial_core.c +++ b/trunk/drivers/serial/serial_core.c @@ -371,7 +371,8 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, */ termios->c_cflag &= ~CBAUD; if (old) { - termios->c_cflag |= old->c_cflag & CBAUD; + baud = tty_termios_baud_rate(old); + tty_termios_encode_baud_rate(termios, baud, baud); old = NULL; continue; } @@ -380,7 +381,7 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios, * As a last resort, if the quotient is zero, * default to 9600 bps */ - termios->c_cflag |= B9600; + tty_termios_encode_baud_rate(termios, 9600, 9600); } return 0;