OSDN Git Service

tty: serial: imx: use the sg count from dma_map_sg
authorPeng Fan <peng.fan@nxp.com>
Thu, 7 Nov 2019 06:42:53 +0000 (06:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 07:18:37 +0000 (08:18 +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

index d607cb2..b59d0da 100644 (file)
@@ -545,7 +545,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,