raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

mtd: spi-nor: cadence-quadspi: Return error code in cqspi_direct_read_execute()

Browse Source 
commit 91d7b67000 upstream.

We return 0 unconditionally in 'cqspi_direct_read_execute()'.
However, 'ret' is set to some error codes in several error handling
paths.

Return 'ret' instead to propagate the error code.

Fixes: ffa639e069 ("mtd: spi-nor: cadence-quadspi: Add DMA support for direct mode reads")
Cc: <stable@vger.kernel.org>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET
2018-10-16 09:13:46 +02:00
committed by Greg Kroah-Hartman
parent ab2b363733
commit 98f1ce39c9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/spi-nor/cadence-quadspi.c
View File

@@ -1000,7 +1000,7 @@ static int cqspi_direct_read_execute(struct spi_nor *nor, u_char *buf,
err_unmap: err_unmap:
dma_unmap_single(nor->dev, dma_dst, len, DMA_DEV_TO_MEM); dma_unmap_single(nor->dev, dma_dst, len, DMA_DEV_TO_MEM);
return 0; return ret;
} }
static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, static ssize_t cqspi_read(struct spi_nor *nor, loff_t from,