From 09259e5e8dca77b7698340e22a0c5925875bbcee Mon Sep 17 00:00:00 2001
From: Christian Melki <christian.melki@ericsson.se>
Date: Mon, 30 Apr 2012 11:21:26 +0200
Subject: [PATCH] --- yaml --- r: 304207 b: refs/heads/master c:
 f9a9111b540fd67db5dab332f4b83d86c90e27b1 h: refs/heads/master i:   304205:
 cf79202e76dfd48425e7de5102b3da7346ab94ba   304203:
 76ba3f92159a33b08d331216bfba6d165e1f89fb   304199:
 f30c7eb2f45abdeeb4637ce45a27ce8f9b53339f   304191:
 c88454474eacddfadd46cde6b332c4b7984353b5 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/tty/serial/8250/8250.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2bb8d908eb89..cbb4f12824c9 100644
--- 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
index 182efcc90e2e..c9ac4eabe35a 100644
--- 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;
+		}
 	}
 
 	/*