commit 8372ae7982c1ae5f95b61db22ab369d03dd968ec
author Linux Build Service Account <lnxbuild@localhost> Wed May 30 21:57:35 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Wed May 30 21:57:35 2012 -0700
tree c0ca1dc7b6ecf3ce082ec3025432f5061bb82f2c
parent d110434c0e8f1b32b276d98980fa0e9856e5fe04
parent 4f1025fb7e4fa0bad3dacabc5df8f666d4c3d321

Merge "msm_serial_hs_lite: Read back the NCF register after writing" into msm-3.0

drivers/tty/serial/msm_serial_hs_lite.c

diff --git a/drivers/tty/serial/msm_serial_hs_lite.c b/drivers/tty/serial/msm_serial_hs_lite.c
index 62d25cf..7370f3c 100644
--- a/drivers/tty/serial/msm_serial_hs_lite.c
+++ b/drivers/tty/serial/msm_serial_hs_lite.c
@@ -384,14 +384,15 @@
 	/* Handle x_char */
 	if (port->x_char) {
 		wait_for_xmitr(port, UARTDM_ISR_TX_READY_BMSK);
-		msm_hsl_write(port, tx_count + 1,
-			regmap[vid][UARTDM_NCF_TX]);
+		msm_hsl_write(port, tx_count + 1, regmap[vid][UARTDM_NCF_TX]);
+		msm_hsl_read(port, regmap[vid][UARTDM_NCF_TX]);
 		msm_hsl_write(port, port->x_char, regmap[vid][UARTDM_TF]);
 		port->icount.tx++;
 		port->x_char = 0;
 	} else if (tx_count) {
 		wait_for_xmitr(port, UARTDM_ISR_TX_READY_BMSK);
 		msm_hsl_write(port, tx_count, regmap[vid][UARTDM_NCF_TX]);
+		msm_hsl_read(port, regmap[vid][UARTDM_NCF_TX]);
 	}
 	if (!tx_count) {
 		msm_hsl_stop_tx(port);