]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
misc: fastrpc: fix incorrect usage of dma_map_sgtable
authorJonathan Marek <jonathan@marek.ca>
Mon, 8 Feb 2021 20:04:01 +0000 (15:04 -0500)
committerAndrea Righi <andrea.righi@canonical.com>
Mon, 15 Mar 2021 14:09:31 +0000 (15:09 +0100)
[ Upstream commit b212658aebda82f92967bcbd4c7380d607c3d803 ]

dma_map_sgtable() returns 0 on success, which is the opposite of what this
code was doing.

Fixes: 7cd7edb89437 ("misc: fastrpc: fix common struct sg_table related issues")
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Link: https://lore.kernel.org/r/20210208200401.31100-1-jonathan@marek.ca
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
drivers/misc/fastrpc.c

index 70eb5ed942d036c71006a2187fdff08152eb9623..f12e909034ac03fde819835d6cfc0186b57d2721 100644 (file)
@@ -520,12 +520,13 @@ fastrpc_map_dma_buf(struct dma_buf_attachment *attachment,
 {
        struct fastrpc_dma_buf_attachment *a = attachment->priv;
        struct sg_table *table;
+       int ret;
 
        table = &a->sgt;
 
-       if (!dma_map_sgtable(attachment->dev, table, dir, 0))
-               return ERR_PTR(-ENOMEM);
-
+       ret = dma_map_sgtable(attachment->dev, table, dir, 0);
+       if (ret)
+               table = ERR_PTR(ret);
        return table;
 }