From 40555e6d2b43a79bb9bf1a2ebb8d1aec9c25be83 Mon Sep 17 00:00:00 2001 From: Guillaume Bertholon Date: Tue, 8 Feb 2022 17:33:56 +0100 Subject: [PATCH] serial: sh-sci: Fix misplaced backport of "Fix late enablement of AUTORTS" 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 Signed-off-by: Greg Kroah-Hartman --- 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 b4f528d26bf1..5c6243a31166 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2377,6 +2377,10 @@ done: 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 @@ done: */ 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 /*