---

yaml --- r: 304207 b: refs/heads/master c: f9a9111 h: refs/heads/master i: 304205: cf79202 304203: 76ba3f9 304199: f30c7eb 304191: c884544 v: v3
git-mirror · May 1, 2012 · 09259e5 · 09259e5
1 parent 95ef6c2
commit 09259e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaa10eb1d0034eccc096f583fe308f0921617598
+refs/heads/master: f9a9111b540fd67db5dab332f4b83d86c90e27b1
diff --git a/trunk/drivers/tty/serial/8250/8250.c b/trunk/drivers/tty/serial/8250/8250.c
@@ -2259,10 +2259,11 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
 		quot++;
 
 	if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) {
-		if (baud < 2400)
-			fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
-		else
-			fcr = uart_config[port->type].fcr;
+		fcr = uart_config[port->type].fcr;
+		if (baud < 2400) {
+			fcr &= ~UART_FCR_TRIGGER_MASK;
+			fcr |= UART_FCR_TRIGGER_1;
+		}
 	}
 
 	/*