Messages in this thread | | | Date | Thu, 21 Jan 2010 14:34:07 +0100 | From | Sascha Hauer <> | Subject | Re: [PATCH 6/8] serial: imx: bit &/| confusion |
| |
On Wed, Jan 20, 2010 at 03:50:01PM -0800, Greg Kroah-Hartman wrote: > 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>
Acked-by: Sascha Hauer <s.hauer@pengutronix.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 > >
-- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |