Merge branch 'uc-logic' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / serial / 21285.c

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 8681f13450562a75e28ab802f070604b72fee72f..d89aa38c5cf04a2c0adf7959da54fcd84eaa965c 100644 (file)
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -216,7 +216,7 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
                        struct ktermios *old)
 {
        unsigned long flags;
-       unsigned int baud, quot, h_lcr;
+       unsigned int baud, quot, h_lcr, b;
 
        /*
         * We don't support modem control lines.
@@ -234,12 +234,8 @@ 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->state && port->state->port.tty) {
-               struct tty_struct *tty = port->state->port.tty;
-               unsigned int b = port->uartclk / (16 * quot);
-               tty_encode_baud_rate(tty, b, b);
-       }
+       b = port->uartclk / (16 * quot);
+       tty_termios_encode_baud_rate(termios, b, b);
 
        switch (termios->c_cflag & CSIZE) {
        case CS5: