From df5b15dd1f0c6a4ee87a814936e94b36d2c83df2 Mon Sep 17 00:00:00 2001 From: Steven Miao Date: Wed, 7 Nov 2012 13:27:56 +0800 Subject: [PATCH] --- yaml --- r: 338411 b: refs/heads/master c: 9642dbe73c8a3b55a812253fcb9add9eeed4ca81 h: refs/heads/master i: 338409: 4fd918001c7be9e33887c45bf51b63926467567f 338407: 7fcf335e588d82f8e44cb8b94d7d20f16e2c8e2c v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/bfin_uart.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bb25b1040e35..86e971dd740b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a876b39b5bc94f67e8a3a7adfd270b8c21fc762 +refs/heads/master: 9642dbe73c8a3b55a812253fcb9add9eeed4ca81 diff --git a/trunk/drivers/tty/serial/bfin_uart.c b/trunk/drivers/tty/serial/bfin_uart.c index 9242d56ba267..ca64c4a83ce0 100644 --- a/trunk/drivers/tty/serial/bfin_uart.c +++ b/trunk/drivers/tty/serial/bfin_uart.c @@ -477,9 +477,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; - dma_disable_irq_nosync(uart->rx_dma_channel); - spin_lock_bh(&uart->rx_lock); + spin_lock_irqsave(&uart->rx_lock, flags); /* 2D DMA RX buffer ring is used. Because curr_y_count and * curr_x_count can't be read as an atomic operation, @@ -510,8 +510,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart) uart->rx_dma_buf.tail = uart->rx_dma_buf.head; } - spin_unlock_bh(&uart->rx_lock); - dma_enable_irq(uart->rx_dma_channel); + spin_unlock_irqrestore(&uart->rx_lock, flags); mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES); }