From b4fb62cc42478247bb6b6791f8403d21c25cf7ca Mon Sep 17 00:00:00 2001 From: vikram pandita Date: Mon, 15 Feb 2010 10:03:33 -0800 Subject: [PATCH] --- yaml --- r: 184705 b: refs/heads/master c: 30e53bccfa15c6c0839c87705a66d478bb10baf5 h: refs/heads/master i: 184703: abdd891650192b7f4f0c515cd287f8d8ff775c85 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/serial.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e712cfdc0cf5..b7b630bcb361 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2586ef0d1db6d606e5ceb7fbf97f34c8b402e90c +refs/heads/master: 30e53bccfa15c6c0839c87705a66d478bb10baf5 diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c index 2b784002bf77..5f3035ec0d6f 100644 --- a/trunk/arch/arm/mach-omap2/serial.c +++ b/trunk/arch/arm/mach-omap2/serial.c @@ -716,15 +716,16 @@ void __init omap_serial_init_port(int port) DEV_CREATE_FILE(dev, &dev_attr_sleep_timeout); } - /* omap44xx: Never read empty UART fifo - * omap3xxx: Never read empty UART fifo on UARTs - * with IP rev >=0x52 - */ - if (cpu_is_omap44xx()) - uart->p->serial_in = serial_in_override; - else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF) - >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV) - uart->p->serial_in = serial_in_override; + /* + * omap44xx: Never read empty UART fifo + * omap3xxx: Never read empty UART fifo on UARTs + * with IP rev >=0x52 + */ + if (cpu_is_omap44xx()) + uart->p->serial_in = serial_in_override; + else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF) + >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV) + uart->p->serial_in = serial_in_override; } /**