---

yaml
---
r: 283583
b: refs/heads/master
c: 73c3d53
h: refs/heads/master
i:
  283581: c967164
  283579: abf11f8
  283575: fccdbad
  283567: 87ad0e5
  283551: 2ea2131
  283519: f303c8b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faf02f8fee5563ea7f950b3f5f08c654aa6c4525
+refs/heads/master: 73c3d53f38e0a8e6c67b0d12d77a8e77c082cd03

trunk/drivers/tty/serial/sh-sci.c

@@ -1771,18 +1771,25 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 
 	sci_init_pins(port, termios->c_cflag);
 
-	if (s->cfg->capabilities & SCIx_HAVE_RTSCTS) {
-		reg = sci_getreg(port, SCFCR);
-		if (reg->size) {
-			unsigned short ctrl;
+	reg = sci_getreg(port, SCFCR);
+	if (reg->size) {
+		unsigned short ctrl = sci_in(port, SCFCR);
 
-			ctrl = sci_in(port, SCFCR);
+		if (s->cfg->capabilities & SCIx_HAVE_RTSCTS) {
 			if (termios->c_cflag & CRTSCTS)
 				ctrl |= SCFCR_MCE;
 			else
 				ctrl &= ~SCFCR_MCE;
-			sci_out(port, SCFCR, ctrl);
 		}
+
+		/*
+		 * As we've done a sci_reset() above, ensure we don't
+		 * interfere with the FIFOs while toggling MCE. As the
+		 * reset values could still be set, simply mask them out.
+		 */
+		ctrl &= ~(SCFCR_RFRST | SCFCR_TFRST);
+
+		sci_out(port, SCFCR, ctrl);
 	}
 
 	sci_out(port, SCSCR, s->cfg->scscr);