From 59e9e0947efd901938ea153e98b44a4d2d0fb41c Mon Sep 17 00:00:00 2001
From: Kalle Pokki <kalle.pokki@iki.fi>
Date: Wed, 1 Nov 2006 09:52:41 +0200
Subject: [PATCH] --- yaml --- r: 40873 b: refs/heads/master c:
 599540a85595bd5950354bd95f5ebf9c6e07c971 h: refs/heads/master i:   40871:
 62f80809a64c6828b30e1acf3baf4343e60f992a v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/serial/cpm_uart/cpm_uart_core.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e39d417c3141..fe2d7c25d83c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 621da0f8af228525e4b40390e36fbdc44a587cf1
+refs/heads/master: 599540a85595bd5950354bd95f5ebf9c6e07c971
diff --git a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
index 0abb544ae63d..32fd8c83bd8e 100644
--- a/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/trunk/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -195,10 +195,8 @@ static void cpm_uart_start_tx(struct uart_port *port)
 	if (cpm_uart_tx_pump(port) != 0) {
 		if (IS_SMC(pinfo)) {
 			smcp->smc_smcm |= SMCM_TX;
-			smcp->smc_smcmr |= SMCMR_TEN;
 		} else {
 			sccp->scc_sccm |= UART_SCCM_TX;
-			pinfo->sccp->scc_gsmrl |= SCC_GSMRL_ENT;
 		}
 	}
 }
@@ -421,9 +419,10 @@ static int cpm_uart_startup(struct uart_port *port)
 	/* Startup rx-int */
 	if (IS_SMC(pinfo)) {
 		pinfo->smcp->smc_smcm |= SMCM_RX;
-		pinfo->smcp->smc_smcmr |= SMCMR_REN;
+		pinfo->smcp->smc_smcmr |= (SMCMR_REN | SMCMR_TEN);
 	} else {
 		pinfo->sccp->scc_sccm |= UART_SCCM_RX;
+		pinfo->sccp->scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
 	}
 
 	if (!(pinfo->flags & FLAG_CONSOLE))