From 9595875eb9a523c9d7cc515a86d16918f84803be Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Thu, 11 Jun 2009 13:51:33 +0100 Subject: [PATCH] --- yaml --- r: 146286 b: refs/heads/master c: 2860b7911137eabb01c159abefb506e538ff3cb7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/bfin_5xx.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1a8b2dde6d54..f7888fecb9fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84507794a9d5d4decd6bc9c111480076dba0d301 +refs/heads/master: 2860b7911137eabb01c159abefb506e538ff3cb7 diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c index 64603f5bb703..e2f6b1bfac98 100644 --- a/trunk/drivers/serial/bfin_5xx.c +++ b/trunk/drivers/serial/bfin_5xx.c @@ -479,9 +479,9 @@ static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart) void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart) { int x_pos, pos; - unsigned long flags; - spin_lock_irqsave(&uart->port.lock, flags); + dma_disable_irq(uart->rx_dma_channel); + spin_lock_bh(&uart->port.lock); /* 2D DMA RX buffer ring is used. Because curr_y_count and * curr_x_count can't be read as an atomic operation, @@ -512,7 +512,8 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart) uart->rx_dma_buf.tail = uart->rx_dma_buf.head; } - spin_unlock_irqrestore(&uart->port.lock, flags); + spin_unlock_bh(&uart->port.lock); + dma_enable_irq(uart->rx_dma_channel); mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES); }