From 1d0c2e0a9c0c39f2ef2cd15fc6fbbbb739158172 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Mon, 13 Oct 2008 10:33:33 +0100
Subject: [PATCH] --- yaml --- r: 113413 b: refs/heads/master c:
 5ffdeea2f99ed9d46bf954c9fdc64da7da57e81b h: refs/heads/master i:   113411:
 aaa2f92042b83b493b3e500a571d0aae583f57c6 v: v3

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

diff --git a/[refs] b/[refs]
index b024de03e11d..3494952916de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08668ab7c2ca9bed281eb6763e5a8e15384b7fdc
+refs/heads/master: 5ffdeea2f99ed9d46bf954c9fdc64da7da57e81b
diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c
index 8d2d75706685..5e20f50342a9 100644
--- a/trunk/drivers/serial/bfin_5xx.c
+++ b/trunk/drivers/serial/bfin_5xx.c
@@ -301,7 +301,11 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
 	bfin_serial_mctrl_check(uart);
 
 	if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
-		bfin_serial_stop_tx(&uart->port);
+#ifdef CONFIG_BF54x
+		/* Clear TFI bit */
+		UART_PUT_LSR(uart, TFI);
+#endif
+		UART_CLEAR_IER(uart, ETBEI);
 		return;
 	}