[PATCH] spi: mtk-snfi: preserve dma_mapping_error() error codes

Dan Carpenter dan.carpenter at oracle.com
Fri Apr 29 10:41:37 PDT 2022


Return -ENOMEM of there is a dma mapping error.  Do not return success.

Fixes: 764f1b748164 ("spi: add driver for MTK SPI NAND Flash Interface")
Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
---
 drivers/spi/spi-mtk-snfi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-mtk-snfi.c b/drivers/spi/spi-mtk-snfi.c
index 2c556e304673..d66bf9762557 100644
--- a/drivers/spi/spi-mtk-snfi.c
+++ b/drivers/spi/spi-mtk-snfi.c
@@ -903,7 +903,8 @@ static int mtk_snand_read_page_cache(struct mtk_snand *snf,
 	nfi_write32(snf, NFI_CON, (snf->nfi_cfg.nsectors << CON_SEC_NUM_S));
 
 	buf_dma = dma_map_single(snf->dev, buf, dma_len, DMA_FROM_DEVICE);
-	if (dma_mapping_error(snf->dev, buf_dma)) {
+	ret = dma_mapping_error(snf->dev, buf_dma);
+	if (ret) {
 		dev_err(snf->dev, "DMA mapping failed.\n");
 		goto cleanup;
 	}
@@ -1092,7 +1093,8 @@ static int mtk_snand_write_page_cache(struct mtk_snand *snf,
 
 	nfi_write32(snf, NFI_CON, (snf->nfi_cfg.nsectors << CON_SEC_NUM_S));
 	buf_dma = dma_map_single(snf->dev, snf->buf, dma_len, DMA_TO_DEVICE);
-	if (dma_mapping_error(snf->dev, buf_dma)) {
+	ret = dma_mapping_error(snf->dev, buf_dma);
+	if (ret) {
 		dev_err(snf->dev, "DMA mapping failed.\n");
 		goto cleanup;
 	}
-- 
2.35.1




More information about the Linux-mediatek mailing list