diff options
| author | Roel Kluin <[email protected]> | 2009-12-09 12:31:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2010-01-20 15:03:30 -0800 |
| commit | 2e2eb509aa7a333fe9931cf306fc7dbc3473f25b (patch) | |
| tree | 175318968883c5aeadf4ad4552fa51554865898e | |
| parent | 16ae2a877bf4179737921235e85ceffd7b79354f (diff) | |
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]>
| -rw-r--r-- | drivers/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 18130f11238e..60d665a17a88 100644 --- 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; |