projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04d8497
)
tty: serial: imx: use the sg count from dma_map_sg
author
Peng Fan
<peng.fan@nxp.com>
Thu, 7 Nov 2019 06:42:53 +0000
(06:42 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 07:19:36 +0000
(08:19 +0100)
commit
596fd8dffb745afcebc0ec6968e17fe29f02044c
upstream.
The dmaengine_prep_slave_sg needs to use sg count returned
by dma_map_sg, not use sport->dma_tx_nents, because the return
value of dma_map_sg is not always same with "nents".
Fixes:
b4cdc8f61beb
("serial: imx: add DMA support for imx6q")
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link:
https://lore.kernel.org/r/1573108875-26530-1-git-send-email-peng.fan@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/imx.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/tty/serial/imx.c
b/drivers/tty/serial/imx.c
index 6d596c6351591bc02103441f0e02b06a0c4c921f..e75bd8d7e6f68707b13068c59b95a89a1383a5ed 100644
(file)
--- a/
drivers/tty/serial/imx.c
+++ b/
drivers/tty/serial/imx.c
@@
-548,7
+548,7
@@
static void imx_dma_tx(struct imx_port *sport)
dev_err(dev, "DMA mapping error for TX.\n");
return;
}
- desc = dmaengine_prep_slave_sg(chan, sgl,
sport->dma_tx_nents
,
+ desc = dmaengine_prep_slave_sg(chan, sgl,
ret
,
DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT);
if (!desc) {
dma_unmap_sg(dev, sgl, sport->dma_tx_nents,