On Tue, 16 Oct 2018 09:13:46 +0200
Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> wrote:
> 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")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Queued to the fixes branch after adjusting the subject to make it
shorter and adding a Cc-stable tag.
Thanks,
Boris
> ---
> drivers/mtd/spi-nor/cadence-quadspi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
> index 8e714fbfa521..6e9cbd1a0b6d 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_DEV_TO_MEM);
>
> - return 0;
> + return ret;
> }
>
> static ssize_t cqspi_read(struct spi_nor *nor, loff_t from,
