Thread (776 messages) 776 messages, 1 author, 2021-03-02
STALE1931d REVIEWED: 8 (8M)

[PATCH 5.11 514/775] misc: fastrpc: fix incorrect usage of dma_map_sgtable

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2021-03-02 05:31:19
Also in: lkml
Subsystem: char and misc drivers, qualcomm fastrpc driver, the rest · Maintainers: Arnd Bergmann, Greg Kroah-Hartman, Srinivas Kandagatla, Amol Maheshwari, Linus Torvalds

From: Jonathan Marek <redacted>

[ 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 <redacted>
Link: https://lore.kernel.org/r/20210208200401.31100-1-jonathan@marek.ca (local)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/misc/fastrpc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 70eb5ed942d03..f12e909034ac0 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -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;
 }
 
-- 
2.27.0


Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help