OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin Serial Driver: fix bug - use mod_timer to replace only add_timer. 

http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=4045
If adding timer in both timer handler and rx interrupt, a timer may be
added when it is till in the pending list.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Sonic Zhang 2008-04-25 04:36:47 +08:00 committed by Bryan Wu
parent 50e2e15afa
commit 0a27842337
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/serial/bfin_5xx.c
View File

@ -506,8 +506,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
uart->rx_dma_buf.tail = uart->rx_dma_buf.head; uart->rx_dma_buf.tail = uart->rx_dma_buf.head;
} }
uart->rx_dma_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES; mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES);
add_timer(&(uart->rx_dma_timer));
} }
static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id) static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
@ -550,9 +549,7 @@ static irqreturn_t bfin_serial_dma_rx_int(int irq, void *dev_id)
clear_dma_irqstat(uart->rx_dma_channel); clear_dma_irqstat(uart->rx_dma_channel);
spin_unlock(&uart->port.lock); spin_unlock(&uart->port.lock);
del_timer(&(uart->rx_dma_timer)); mod_timer(&(uart->rx_dma_timer), jiffies);
uart->rx_dma_timer.expires = jiffies;
add_timer(&(uart->rx_dma_timer));
return IRQ_HANDLED; return IRQ_HANDLED;
} }