From 04ddeb29592fcb83982d541f6f3d60fd9bac77de Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Fri, 25 Apr 2008 04:36:47 +0800 Subject: [PATCH] --- yaml --- r: 92347 b: refs/heads/master c: 0a2784233785226fe5882c8af15118476f89e98e h: refs/heads/master i: 92345: ae437adde6f5aca39f17fae75ed81024a4765a1f 92343: fcc7b4415f4a4ca75da5875739e1b1d8451471e4 v: v3 --- [refs] | 2 +- trunk/drivers/serial/bfin_5xx.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 91c9d8048c4b..bdab0f209dca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50e2e15afaac59c955f43d78d0a1e53cf8a76370 +refs/heads/master: 0a2784233785226fe5882c8af15118476f89e98e diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c index 47ca7b0267df..5f55534a290b 100644 --- a/trunk/drivers/serial/bfin_5xx.c +++ b/trunk/drivers/serial/bfin_5xx.c @@ -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_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES; - add_timer(&(uart->rx_dma_timer)); + mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES); } 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); spin_unlock(&uart->port.lock); - del_timer(&(uart->rx_dma_timer)); - uart->rx_dma_timer.expires = jiffies; - add_timer(&(uart->rx_dma_timer)); + mod_timer(&(uart->rx_dma_timer), jiffies); return IRQ_HANDLED; }