serial: imx: bit &/| confusion

Since UCR1_UARTEN is defined 1, the port was always treated as enabled.

Signed-off-by: Roel Kluin <[email protected]>
Cc: Alan Cox <[email protected]>
Acked-by: Oskar Schirmer <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Fabian Godehardt <[email protected]>
Cc: Daniel Glöckner <[email protected]>
Cc: Russell King <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 18130f11238e6025b16682c9a00cca218727e370..60d665a17a885b280cd98b289dd783a58d9d4ac7 100644 (file)
--- a/drivers/serial/imx.c
+++ b/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;