From e061420079f0886ba5fa2a6b792446b11f30fef7 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 10 Oct 2010 21:28:35 +0400 Subject: [PATCH] --- yaml --- r: 217018 b: refs/heads/master c: 79fc3e21401be720708931002268b676e36fcf41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/omap-serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 50e34b71508d..9d50b79b2a12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e4905c0199d683497833be60a428c784d7575b8 +refs/heads/master: 79fc3e21401be720708931002268b676e36fcf41 diff --git a/trunk/drivers/serial/omap-serial.c b/trunk/drivers/serial/omap-serial.c index 2ee1d3282a8c..14365f72b664 100644 --- a/trunk/drivers/serial/omap-serial.c +++ b/trunk/drivers/serial/omap-serial.c @@ -1055,7 +1055,7 @@ static void serial_omap_rx_timeout(unsigned long uart_no) { struct uart_omap_port *up = ui[uart_no]; unsigned int curr_dma_pos, curr_transmitted_size; - unsigned int ret = 0; + int ret = 0; curr_dma_pos = omap_get_dma_dst_pos(up->uart_dma.rx_dma_channel); if ((curr_dma_pos == up->uart_dma.prev_rx_dma_pos) ||