]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: rawnand: stm32_fmc2: Fix dma_map_sg error check
authorJack Wang <jinpu.wang@ionos.com>
Sat, 13 Sep 2025 15:19:11 +0000 (11:19 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Oct 2025 11:35:37 +0000 (13:35 +0200)
[ Upstream commit 43b81c2a3e6e07915151045aa13a6e8a9bd64419 ]

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

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Christophe Kerello <christophe.kerello@foss.st.com>
Cc: Cai Huoqing <cai.huoqing@linux.dev>
Cc: linux-mtd@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Reviewed-by: Christophe Kerello <christophe.kerello@foss.st.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220819060801.10443-5-jinpu.wang@ionos.com
Stable-dep-of: 513c40e59d5a ("mtd: rawnand: stm32_fmc2: avoid overlapping mappings on ECC buffer")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mtd/nand/raw/stm32_fmc2_nand.c

index f5de79a805aac4b568fe80e555b96a437a52ea96..ba008577db95b87897e5ea7eaeb6f046d771d8d8 100644 (file)
@@ -858,8 +858,8 @@ static int stm32_fmc2_nfc_xfer(struct nand_chip *chip, const u8 *buf,
 
        ret = dma_map_sg(nfc->dev, nfc->dma_data_sg.sgl,
                         eccsteps, dma_data_dir);
-       if (ret < 0)
-               return ret;
+       if (!ret)
+               return -EIO;
 
        desc_data = dmaengine_prep_slave_sg(dma_ch, nfc->dma_data_sg.sgl,
                                            eccsteps, dma_transfer_dir,
@@ -889,8 +889,10 @@ static int stm32_fmc2_nfc_xfer(struct nand_chip *chip, const u8 *buf,
 
                ret = dma_map_sg(nfc->dev, nfc->dma_ecc_sg.sgl,
                                 eccsteps, dma_data_dir);
-               if (ret < 0)
+               if (!ret) {
+                       ret = -EIO;
                        goto err_unmap_data;
+               }
 
                desc_ecc = dmaengine_prep_slave_sg(nfc->dma_ecc_ch,
                                                   nfc->dma_ecc_sg.sgl,