diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-22 12:22:11 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-22 12:22:11 -0800 |
| commit | 52a248c714fb17267c89520a4a854b0f65de998c (patch) | |
| tree | b08803dad70c8bfeba8a20e4c06b24ea6ce5cf9d /tty.current | |
| parent | ae75e9fa49d0b2a2a776794dad9e420e7bc269f2 (diff) | |
| download | patches-52a248c714fb17267c89520a4a854b0f65de998c.tar.gz | |
huge catchup on pending patches
Diffstat (limited to 'tty.current')
| -rw-r--r-- | tty.current/serial-imx-bit-confusion.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/tty.current/serial-imx-bit-confusion.patch b/tty.current/serial-imx-bit-confusion.patch new file mode 100644 index 00000000000000..fba9b75042b2fc --- /dev/null +++ b/tty.current/serial-imx-bit-confusion.patch @@ -0,0 +1,38 @@ +From akpm@linux-foundation.org Tue Dec 22 11:39:04 2009 +From: Roel Kluin <roel.kluin@gmail.com> +Date: Wed, 09 Dec 2009 12:31:36 -0800 +Subject: serial: imx: bit &/| confusion +To: greg@kroah.com +Cc: alan@lxorguk.ukuu.org.uk, akpm@linux-foundation.org, roel.kluin@gmail.com, alan@linux.intel.com, dg@emlix.com, fg@emlix.com, os@emlix.com, rmk@arm.linux.org.uk, s.hauer@pengutronix.de +Message-ID: <200912092031.nB9KVaHk003935@imap1.linux-foundation.org> + + +From: Roel Kluin <roel.kluin@gmail.com> + +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> + +--- + drivers/serial/imx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/serial/imx.c ++++ b/drivers/serial/imx.c +@@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port + 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; |