diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2018-10-16 09:13:46 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-11-05 23:52:18 +0100 |
| commit | 91d7b67000c6e9bd605624079fee5a084238ad92 (patch) | |
| tree | 31d08cbec7813a5d93b73dce6d904f457f209272 | |
| parent | d098093ba06eb032057d1aca1c2e45889e099d00 (diff) | |
| download | linux-stable-91d7b67000c6e9bd605624079fee5a084238ad92.tar.gz linux-stable-91d7b67000c6e9bd605624079fee5a084238ad92.tar.bz2 linux-stable-91d7b67000c6e9bd605624079fee5a084238ad92.zip | |
mtd: spi-nor: cadence-quadspi: Return error code in cqspi_direct_read_execute()
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: ffa639e069fb ("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>
| -rw-r--r-- | drivers/mtd/spi-nor/cadence-quadspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c index e24db817154e..d846428ef038 100644 --- a/drivers/mtd/spi-nor/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/cadence-quadspi.c @@ -996,7 +996,7 @@ static int cqspi_direct_read_execute(struct spi_nor *nor, u_char *buf, err_unmap: dma_unmap_single(nor->dev, dma_dst, len, DMA_FROM_DEVICE); - return 0; + return ret; } static ssize_t cqspi_read(struct spi_nor *nor, loff_t from, |