projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fba67e8
)
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>
Wed, 13 Nov 2019 11:01:15 +0000
(19:01 +0800)
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
|
history
diff --git
a/drivers/tty/serial/imx.c
b/drivers/tty/serial/imx.c
index
357d3ff
..
a9e20e6
100644
(file)
--- a/
drivers/tty/serial/imx.c
+++ b/
drivers/tty/serial/imx.c
@@
-619,7
+619,7
@@
static void imx_uart_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,