The upstream commit 5f76895e4c71 ("serial: sh-sci: Fix late enablement of AUTORTS") inserted a new call to .set_mctrl(). However the backported version in stable (commit ad3faea03fdf ("serial: sh-sci: Fix late enablement of AUTORTS")) does not insert it at the same position.
This patch moves the added instructions back to where they should be according to the upsteam patch.
Fixes: ad3faea03fdf ("serial: sh-sci: Fix late enablement of AUTORTS") Signed-off-by: Guillaume Bertholon guillaume.bertholon@ens.fr --- drivers/tty/serial/sh-sci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index b4f528d..5c6243a 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2377,6 +2377,10 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
serial_port_out(port, SCFCR, ctrl); } + if (port->flags & UPF_HARD_FLOW) { + /* Refresh (Auto) RTS */ + sci_set_mctrl(port, port->mctrl); + }
scr_val |= s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0); dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val); @@ -2391,10 +2395,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, */ udelay(DIV_ROUND_UP(10 * 1000000, baud)); } - if (port->flags & UPF_HARD_FLOW) { - /* Refresh (Auto) RTS */ - sci_set_mctrl(port, port->mctrl); - }
#ifdef CONFIG_SERIAL_SH_SCI_DMA /* -- 2.7.4