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 5.15 361/530] mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg
    Date
    From: Jack Wang <jinpu.wang@ionos.com>

    [ Upstream commit 6b207ce8a96a71e966831e3a13c38143ba9a73c1 ]

    dma_map_sg return 0 on error, fix the error check, and return -EIO
    to caller.

    Fixes: dbc049eee730 ("mailbox: Add driver for Broadcom FlexRM ring manager")
    Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mailbox/bcm-flexrm-mailbox.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c
    index 78073ad1f2f1..b7e9fd53d47d 100644
    --- a/drivers/mailbox/bcm-flexrm-mailbox.c
    +++ b/drivers/mailbox/bcm-flexrm-mailbox.c
    @@ -632,15 +632,15 @@ static int flexrm_spu_dma_map(struct device *dev, struct brcm_message *msg)

    rc = dma_map_sg(dev, msg->spu.src, sg_nents(msg->spu.src),
    DMA_TO_DEVICE);
    - if (rc < 0)
    - return rc;
    + if (!rc)
    + return -EIO;

    rc = dma_map_sg(dev, msg->spu.dst, sg_nents(msg->spu.dst),
    DMA_FROM_DEVICE);
    - if (rc < 0) {
    + if (!rc) {
    dma_unmap_sg(dev, msg->spu.src, sg_nents(msg->spu.src),
    DMA_TO_DEVICE);
    - return rc;
    + return -EIO;
    }

    return 0;
    --
    2.35.1


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