---

yaml --- r: 179722 b: refs/heads/master c: 2e2eb50 h: refs/heads/master v: v3
git-mirror · Jan 20, 2010 · b1ab6b8 · b1ab6b8
1 parent 40e57c5
commit b1ab6b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;