aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Gefre <pfg@sgi.com>2005-05-01 08:59:22 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:59:22 -0700
commit5b052d8bb3ad9108489e7475868e14372774ca08 (patch)
treeaa7154aee3b5dcc64ad7efdf7ceb178b0c5f27b8
parent68985e486b708671a7c7d0b4de6d94a1547d1351 (diff)
downloadkernel_samsung_aries-5b052d8bb3ad9108489e7475868e14372774ca08.zip
kernel_samsung_aries-5b052d8bb3ad9108489e7475868e14372774ca08.tar.gz
kernel_samsung_aries-5b052d8bb3ad9108489e7475868e14372774ca08.tar.bz2
[PATCH] Altix ioc4 serial - Arm the read timeout timer before the first read
Arm the read timeout timer before the first read. Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/serial/ioc4_serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index d9629ee..ba4e13a 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -838,7 +838,7 @@ static int inline port_init(struct ioc4_port *port)
port->ip_tx_prod = readl(&port->ip_serial_regs->stcir) & PROD_CONS_MASK;
writel(port->ip_tx_prod, &port->ip_serial_regs->stpir);
port->ip_rx_cons = readl(&port->ip_serial_regs->srpir) & PROD_CONS_MASK;
- writel(port->ip_rx_cons, &port->ip_serial_regs->srcir);
+ writel(port->ip_rx_cons | IOC4_SRCIR_ARM, &port->ip_serial_regs->srcir);
/* Disable interrupts for this 16550 */
uart = port->ip_uart_regs;