Commit 2e2eb509 authored by Roel Kluin's avatar Roel Kluin Committed by Greg Kroah-Hartman

serial: imx: bit &/| confusion

Since UCR1_UARTEN is defined 1, the port was always treated as enabled.
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: default avatarOskar Schirmer <os@emlix.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Fabian Godehardt <fg@emlix.com>
Cc: Daniel Glöckner <dg@emlix.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 16ae2a87
...@@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port *sport, int *baud, ...@@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
int *parity, int *bits) 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 */ /* ok, the port was enabled */
unsigned int ucr2, ubir,ubmr, uartclk; unsigned int ucr2, ubir,ubmr, uartclk;
unsigned int baud_raw; unsigned int baud_raw;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment