From b1ab6b8338aa4a29344a56392a5af5dd9777db2e Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Wed, 9 Dec 2009 12:31:36 -0800
Subject: [PATCH] --- yaml --- r: 179722 b: refs/heads/master c:
 2e2eb509aa7a333fe9931cf306fc7dbc3473f25b h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/serial/imx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c134be825b22..8464888e7e9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16ae2a877bf4179737921235e85ceffd7b79354f
+refs/heads/master: 2e2eb509aa7a333fe9931cf306fc7dbc3473f25b
diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c
index 18130f11238e..60d665a17a88 100644
--- a/trunk/drivers/serial/imx.c
+++ b/trunk/drivers/serial/imx.c
@@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
 			   int *parity, int *bits)
 {
 
-	if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) {
+	if (readl(sport->port.membase + UCR1) & UCR1_UARTEN) {
 		/* ok, the port was enabled */
 		unsigned int ucr2, ubir,ubmr, uartclk;
 		unsigned int baud_raw;