summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-04-03 18:14:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-09 10:30:39 -0700
commit7b246a1d0dfe75346a22bf6589b858a0389e6df1 (patch)
tree94c281bc98196b3ae18225eaca29edf8375c9d54
parent5da527aafed2834852fc4fe21daeaeadf7c61af3 (diff)
downloadlinux-3.10-7b246a1d0dfe75346a22bf6589b858a0389e6df1.tar.gz
linux-3.10-7b246a1d0dfe75346a22bf6589b858a0389e6df1.tar.bz2
linux-3.10-7b246a1d0dfe75346a22bf6589b858a0389e6df1.zip
serial: samsung: fix omission initialize ulcon in reset port fn()
Fix omission initialize ulcon in s3c24xx_serial_resetport(), reset port function in drivers/tty/serial/samsung.c. It has been happened from commit 0dfb3b41("serial: samsung: merge all SoC specific port reset functions") Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: stable <stable@vger.kernel.org> [3.3] Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/samsung.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index de249d265be..d8b0aee3563 100644
--- a/drivers/tty/serial/samsung.c
+++ b/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);