mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
041d7abc4a
* kernel: bump 5.4 to 5.4.79 * ramips: add mt7620-nand driver for NAND flash This add the mt7620-nand driver and enable nand ubifs for subtarget mt7620 Signed-off-by: Chen Minqiang <ptpt52@gmail.com> Co-authored-by: Chen Minqiang <ptpt52@gmail.com>
30 lines
973 B
Diff
30 lines
973 B
Diff
From 31a4e41820cdaad9d4c151beefe5ab0698f4865a Mon Sep 17 00:00:00 2001
|
|
From: Fugang Duan <fugang.duan@nxp.com>
|
|
Date: Thu, 15 Jun 2017 16:48:31 +0800
|
|
Subject: [PATCH] MLK-15094 tty: serial: fsl_lpuart: check dma_tx_in_progress
|
|
in callback
|
|
|
|
There have a corner case that tx DMA .callback() is coming after
|
|
.flush_buffer(), then .callback() should check dma_tx_in_progress
|
|
flag and return in directly.
|
|
|
|
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
|
|
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
|
|
---
|
|
drivers/tty/serial/fsl_lpuart.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
|
@@ -505,6 +505,10 @@ static void lpuart_dma_tx_complete(void
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&sport->port.lock, flags);
|
|
+ if (!sport->dma_tx_in_progress) {
|
|
+ spin_unlock_irqrestore(&sport->port.lock, flags);
|
|
+ return;
|
|
+ }
|
|
|
|
dma_unmap_sg(sport->port.dev, sgl, sport->dma_tx_nents, DMA_TO_DEVICE);
|
|
|