Commit 2e2eb509 authored Dec 09, 2009 by Roel Kluin Committed by Greg Kroah-Hartman Jan 20, 2010

serial: imx: bit &/| confusion



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

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: Oskar 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 16ae2a87

drivers/serial/imx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message