lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 096/159] HSI: omap_ssi_port: Fix dma_map_sg error check
    Date
    From: Jack Wang <jinpu.wang@ionos.com>

    [ Upstream commit 551e325bbd3fb8b5a686ac1e6cf76e5641461cf2 ]

    dma_map_sg return 0 on error, in case of error return -EIO
    to caller.

    Cc: Sebastian Reichel <sre@kernel.org>
    Cc: linux-kernel@vger.kernel.org (open list)
    Fixes: b209e047bc74 ("HSI: Introduce OMAP SSI driver")
    Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hsi/controllers/omap_ssi_port.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
    index 7765de2f1ef1..68619dd6dfc1 100644
    --- a/drivers/hsi/controllers/omap_ssi_port.c
    +++ b/drivers/hsi/controllers/omap_ssi_port.c
    @@ -252,10 +252,10 @@ static int ssi_start_dma(struct hsi_msg *msg, int lch)
    if (msg->ttype == HSI_MSG_READ) {
    err = dma_map_sg(&ssi->device, msg->sgt.sgl, msg->sgt.nents,
    DMA_FROM_DEVICE);
    - if (err < 0) {
    + if (!err) {
    dev_dbg(&ssi->device, "DMA map SG failed !\n");
    pm_runtime_put_autosuspend(omap_port->pdev);
    - return err;
    + return -EIO;
    }
    csdp = SSI_DST_BURST_4x32_BIT | SSI_DST_MEMORY_PORT |
    SSI_SRC_SINGLE_ACCESS0 | SSI_SRC_PERIPHERAL_PORT |
    @@ -269,10 +269,10 @@ static int ssi_start_dma(struct hsi_msg *msg, int lch)
    } else {
    err = dma_map_sg(&ssi->device, msg->sgt.sgl, msg->sgt.nents,
    DMA_TO_DEVICE);
    - if (err < 0) {
    + if (!err) {
    dev_dbg(&ssi->device, "DMA map SG failed !\n");
    pm_runtime_put_autosuspend(omap_port->pdev);
    - return err;
    + return -EIO;
    }
    csdp = SSI_SRC_BURST_4x32_BIT | SSI_SRC_MEMORY_PORT |
    SSI_DST_SINGLE_ACCESS0 | SSI_DST_PERIPHERAL_PORT |
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 18:08    [W:2.774 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site