diff options
| author | Graf Yang <graf.yang@analog.com> | 2010-01-19 06:13:11 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 14:43:17 -0800 |
| commit | 7ed43f6af88b042eb2ac5a3eda1e8e17efae74ee (patch) | |
| tree | 9535396dcce88504e371b920be8a70137d27b477 /drivers/serial/bfin_5xx.c | |
| parent | b2ced4f69ea87399a37b4485280c52034a0161a8 (diff) | |
| download | linux-7ed43f6af88b042eb2ac5a3eda1e8e17efae74ee.tar.gz linux-7ed43f6af88b042eb2ac5a3eda1e8e17efae74ee.tar.bz2 linux-7ed43f6af88b042eb2ac5a3eda1e8e17efae74ee.zip | |
serial: bfin_5xx: need to disable DMA TX interrupt too
If we don't disable the DMA TX channel, an inopportune timeout will
trigger the interrupt handler and may cause a dead lock with the spin_lock.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/bfin_5xx.c')
| -rw-r--r-- | drivers/serial/bfin_5xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index 15843cceb9fc..b5a9b374dad5 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c @@ -488,6 +488,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart) { int x_pos, pos; + dma_disable_irq(uart->tx_dma_channel); dma_disable_irq(uart->rx_dma_channel); spin_lock_bh(&uart->port.lock); @@ -521,6 +522,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart) } spin_unlock_bh(&uart->port.lock); + dma_enable_irq(uart->tx_dma_channel); dma_enable_irq(uart->rx_dma_channel); mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES); |