diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 10:47:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 10:47:30 +1100 |
| commit | 5a4c1876cb7d155d9371024fd36b9b015b3ef23e (patch) | |
| tree | 20dbc814312954794c3761472a94620f51c5675c /drivers | |
| parent | 57cf6b94ec76d114f139e5c63941b6cefb07e716 (diff) | |
| parent | ad75832be8f05a5afac0141e96a077dc6cff05ae (diff) | |
Merge branch 'quilt/tty.current'
Diffstat (limited to 'drivers')
| -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; |