Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3baf5332 authored by Jack Wang's avatar Jack Wang Committed by Greg Kroah-Hartman
Browse files

HSI: omap_ssi_port: Fix dma_map_sg error check 



[ 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: b209e047 ("HSI: Introduce OMAP SSI driver")
Signed-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aa9c0598

drivers/hsi/controllers/omap_ssi_port.c

+4 −4
Original line number Diff line number Diff line
@@ -230,10 +230,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 |
@@ -247,10 +247,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 |