Unverified Commit 73c1a515 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

spi: mtk-snfi: preserve dma_mapping_error() error codes 



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

Fixes: 764f1b74 ("spi: add driver for MTK SPI NAND Flash Interface")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarChuanhong Guo <gch981213@gmail.com>
Link: https://lore.kernel.org/r/YmwjUcTKyQNrrn2g@kili


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 69bb9b29

drivers/spi/spi-mtk-snfi.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

	}