lkml.org 
[lkml]   [2020]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 31/76] tty: serial: imx: use the sg count from dma_map_sg
    Date
    From: Peng Fan <peng.fan@nxp.com>

    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 | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/tty/serial/imx.c
    +++ b/drivers/tty/serial/imx.c
    @@ -545,7 +545,7 @@ static void imx_dma_tx(struct imx_port *
    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,

    \
     
     \ /
      Last update: 2020-01-22 10:32    [W:2.423 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site