--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -524,8 +524,9 @@ static int sc16is7xx_set_baud(struct uar
+@@ -525,8 +525,9 @@ static int sc16is7xx_set_baud(struct uar
/* Enable enhanced features */
regcache_cache_bypass(s->regmap, true);
regcache_cache_bypass(s->regmap, false);
/* Put LCR back to the normal mode */
-@@ -855,7 +856,7 @@ static unsigned int sc16is7xx_get_mctrl(
+@@ -856,7 +857,7 @@ static unsigned int sc16is7xx_get_mctrl(
/* DCD and DSR are not wired and CTS/RTS is handled automatically
* so just indicate DSR and CAR asserted
*/
}
static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)
-@@ -942,14 +943,19 @@ static void sc16is7xx_set_termios(struct
+@@ -943,14 +944,19 @@ static void sc16is7xx_set_termios(struct
regcache_cache_bypass(s->regmap, true);
sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]);
sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]);