Commit 40c9ba0d authored by Jack Wang's avatar Jack Wang Committed by Miquel Raynal
Browse files

mtd: rawnand: marvell: Fix error handle regarding dma_map_sg 



dma_map_sg return 0 on error, in case of error return -EIO,
also add the dma_unmap_sg as rollback on the following error.

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: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220819060801.10443-6-jinpu.wang@ionos.com
parent 43b81c2a

drivers/mtd/nand/raw/marvell_nand.c

+7 −1
Original line number Diff line number Diff line
@@ -865,13 +865,19 @@ static int marvell_nfc_xfer_data_dma(struct marvell_nfc *nfc, 
	marvell_nfc_enable_dma(nfc);

	/* Prepare the DMA transfer */

	sg_init_one(&sg, nfc->dma_buf, dma_len);

	dma_map_sg(nfc->dma_chan->device->dev, &sg, 1, direction);

	ret = dma_map_sg(nfc->dma_chan->device->dev, &sg, 1, direction);

	if (!ret) {

		dev_err(nfc->dev, "Could not map DMA S/G list\n");

		return -ENXIO;

	}



	tx = dmaengine_prep_slave_sg(nfc->dma_chan, &sg, 1,

				     direction == DMA_FROM_DEVICE ?

				     DMA_DEV_TO_MEM : DMA_MEM_TO_DEV,

				     DMA_PREP_INTERRUPT);

	if (!tx) {

		dev_err(nfc->dev, "Could not prepare DMA S/G list\n");

		dma_unmap_sg(nfc->dma_chan->device->dev, &sg, 1, direction);

		return -ENXIO;

	}