Re: [PATCH 6/8] serial: imx: bit &/| confusion

[Sascha Hauer]

On Wed, Jan 20, 2010 at 03:50:01PM -0800, Greg Kroah-Hartman wrote:
> From: Roel Kluin <roel.kluin@xxxxxxxxx>
> 
> Since UCR1_UARTEN is defined 1, the port was always treated as enabled.
> 
> Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
> Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
> Acked-by: Oskar Schirmer <os@xxxxxxxxx>
> Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> Cc: Fabian Godehardt <fg@xxxxxxxxx>
> Cc: Daniel Glöckner <dg@xxxxxxxxx>
> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

> ---
>  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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/