1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 6a48dfa1efe8..0276471cb25e 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -237,6 +237,12 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
         quot = uart_get_divisor(port, baud);
 
+        if (port->info && port->info->tty) {
+                struct tty_struct *tty = port->info->tty;
+                unsigned int b = port->uartclk / (16 * quot);
+                tty_encode_baud_rate(tty, b, b);
+        }
+
         switch (termios->c_cflag & CSIZE) {
         case CS5:
                 h_lcr = 0x00;
@@ -277,8 +283,6 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= RXSTAT_FRAME | RXSTAT_PARITY;
 
-        tty_encode_baud_rate(tty,  baud, baud);
-
         /*
          * Which character status flags should we ignore?
          */