The patch titled serial: bfin_5xx: need to disable DMA TX interrupt too has been added to the -mm tree. Its filename is serial-bfin_5xx-need-to-disable-dma-tx-interrupt-too.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial: bfin_5xx: need to disable DMA TX interrupt too From: Graf Yang <graf.yang@xxxxxxxxxx> 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@xxxxxxxxxx> Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/bfin_5xx.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/serial/bfin_5xx.c~serial-bfin_5xx-need-to-disable-dma-tx-interrupt-too drivers/serial/bfin_5xx.c --- a/drivers/serial/bfin_5xx.c~serial-bfin_5xx-need-to-disable-dma-tx-interrupt-too +++ a/drivers/serial/bfin_5xx.c @@ -488,6 +488,7 @@ void bfin_serial_rx_dma_timeout(struct b { 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 b } 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); _ Patches currently in -mm which might be from graf.yang@xxxxxxxxxx are serial-bfin_5xx-need-to-disable-dma-tx-interrupt-too.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html