Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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@oracle.com>
Reviewed-by: Chuanhong Guo <gch981213@gmail.com>
Link: https://lore.kernel.org/r/YmwjUcTKyQNrrn2g@kili
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Dan Carpenter and committed by
Mark Brown
73c1a515 69bb9b29

+4 -2
+4 -2
drivers/spi/spi-mtk-snfi.c
··· 903 903 nfi_write32(snf, NFI_CON, (snf->nfi_cfg.nsectors << CON_SEC_NUM_S)); 904 904 905 905 buf_dma = dma_map_single(snf->dev, buf, dma_len, DMA_FROM_DEVICE); 906 - if (dma_mapping_error(snf->dev, buf_dma)) { 906 + ret = dma_mapping_error(snf->dev, buf_dma); 907 + if (ret) { 907 908 dev_err(snf->dev, "DMA mapping failed.\n"); 908 909 goto cleanup; 909 910 } ··· 1093 1092 1094 1093 nfi_write32(snf, NFI_CON, (snf->nfi_cfg.nsectors << CON_SEC_NUM_S)); 1095 1094 buf_dma = dma_map_single(snf->dev, snf->buf, dma_len, DMA_TO_DEVICE); 1096 - if (dma_mapping_error(snf->dev, buf_dma)) { 1095 + ret = dma_mapping_error(snf->dev, buf_dma); 1096 + if (ret) { 1097 1097 dev_err(snf->dev, "DMA mapping failed.\n"); 1098 1098 goto cleanup; 1099 1099 }