From feec2f9fa6961510a08e5b28f34ef93df83b6e60 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 3 Apr 2012 18:14:24 -0700
Subject: [PATCH] --- yaml --- r: 299120 b: refs/heads/master c:
 7b246a1d0dfe75346a22bf6589b858a0389e6df1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e3cc60452518..47b05d4393c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5da527aafed2834852fc4fe21daeaeadf7c61af3
+refs/heads/master: 7b246a1d0dfe75346a22bf6589b858a0389e6df1
diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c
index de249d265bec..d8b0aee35632 100644
--- a/trunk/drivers/tty/serial/samsung.c
+++ b/trunk/drivers/tty/serial/samsung.c
@@ -982,6 +982,7 @@ static void s3c24xx_serial_resetport(struct uart_port *port,
 
 	ucon &= ucon_mask;
 	wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
+	wr_regl(port, S3C2410_ULCON, cfg->ulcon);
 
 	/* reset both fifos */
 	wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);