commit 740fb853af04ab049f70c8cf0f2c1a827f973ffd
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 15 12:56:38 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 15 12:56:38 2013 -0800
tree aafb01de3ddc7f974a810da6fe8513382405768d
parent f01cd34fe551458644aca9e65953e95e908a2e3e
parent a8bd52ecff316075e02f0175f82ee191090344b9

Merge "msm_serial_hs : Disable UART interrupts till set_termios is completed"

drivers/tty/serial/msm_serial_hs.c

diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index fd866e1..4b6ba67 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -855,6 +855,7 @@
 	struct sps_pipe *sps_pipe_handle = rx->prod.pipe_handle;
 
 	mutex_lock(&msm_uport->clk_mutex);
+	msm_hs_write(uport, UARTDM_IMR_ADDR, 0);
 
 	/*
 	 * Disable Rx channel of UARTDM
@@ -947,7 +948,6 @@
 
 	uport->read_status_mask = (termios->c_cflag & CREAD);
 
-	msm_hs_write(uport, UARTDM_IMR_ADDR, 0);
 
 	/* Set Transmit software time out */
 	uart_update_timeout(uport, c_cflag, bps);