From 237597f7ab4011ed7ebe0e07fcd541716b1d90d6 Mon Sep 17 00:00:00 2001
From: Fabian Godehardt <fg@emlix.com>
Date: Thu, 11 Jun 2009 14:38:38 +0100
Subject: [PATCH] --- yaml --- r: 146307 b: refs/heads/master c:
 2e1463922a35584c863f71d4021e1e71f76eaed0 h: refs/heads/master i:   146305:
 2089a24fd7edffcbeeb24796445df935d248c9d8   146303:
 b8a4aff8f6b03c2d8e0f192ec3cb9609bdb974e2 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/serial/imx.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d79b58cc7593..777124ff8ad8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 977757311e50dc5d832c9fef34e7555411f7ccd8
+refs/heads/master: 2e1463922a35584c863f71d4021e1e71f76eaed0
diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c
index 49f2e12ba58d..e6c2ba26dcbb 100644
--- a/trunk/drivers/serial/imx.c
+++ b/trunk/drivers/serial/imx.c
@@ -634,6 +634,10 @@ static void imx_shutdown(struct uart_port *port)
 	struct imx_port *sport = (struct imx_port *)port;
 	unsigned long temp;
 
+	temp = readl(sport->port.membase + UCR2);
+	temp &= ~(UCR2_TXEN);
+	writel(temp, sport->port.membase + UCR2);
+
 	/*
 	 * Stop our timer.
 	 */