From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Roel Kluin" <roel.kluin@gmail.com>,
"Alan Cox" <alan@linux.intel.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Fabian Godehardt" <fg@emlix.com>,
"Daniel Glöckner" <dg@emlix.com>,
"Russell King" <rmk@arm.linux.org.uk>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Greg Kroah-Hartman" <gregkh@suse.de>
Subject: [PATCH 6/8] serial: imx: bit &/| confusion
Date: Wed, 20 Jan 2010 15:50:01 -0800 [thread overview]
Message-ID: <1264031403-32239-6-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20100120234759.GC32068@kroah.com>
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 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 18130f1..60d665a 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;
--
1.6.5.7
next prev parent reply other threads:[~2010-01-20 23:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-20 23:47 [GIT PATCH] TTY patches for 2.6.33-rc4 Greg KH
2010-01-20 23:49 ` [PATCH 1/8] compat_ioctl: Supress "unknown cmd" message on serial /dev/console Greg Kroah-Hartman
2010-01-21 0:39 ` Arnd Bergmann
2010-01-20 23:49 ` [PATCH 2/8] nozomi: quick fix for the close/close bug Greg Kroah-Hartman
2010-01-20 23:49 ` [PATCH 3/8] serial: 8250_pnp: use wildcard for serial Wacom tablets Greg Kroah-Hartman
2010-01-20 23:49 ` [PATCH 4/8] serial-core: resume serial hardware with no_console_suspend Greg Kroah-Hartman
2010-01-20 23:50 ` [PATCH 5/8] serial: Fix crash if the minimum rate of the device is > 9600 baud Greg Kroah-Hartman
2010-01-20 23:50 ` Greg Kroah-Hartman [this message]
2010-01-21 13:34 ` [PATCH 6/8] serial: imx: bit &/| confusion Sascha Hauer
2010-01-20 23:50 ` [PATCH 7/8] serial: serial_cs: oxsemi quirk breaks resume Greg Kroah-Hartman
2010-01-20 23:50 ` [PATCH 8/8] tty: fix race in tty_fasync Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1264031403-32239-6-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=dg@emlix.com \
--cc=fg@emlix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=roel.kluin@gmail.com \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox