[PATCH -next] mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()

Boris Brezillon boris.brezillon at free-electrons.com
Mon Jun 13 13:06:25 PDT 2016


On Mon, 13 Jun 2016 14:27:18 +0000
weiyj_lk at 163.com wrote:

> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> 
> In case of error, the function dmaengine_prep_slave_sg() returns NULL
> pointer not ERR_PTR(). The IS_ERR() test in the return value check
> should be replaced with NULL test.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>

Applied.

Thanks,

Boris

> ---
>  drivers/mtd/nand/sunxi_nand.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
> index ef7f6df..653cb3a 100644
> --- a/drivers/mtd/nand/sunxi_nand.c
> +++ b/drivers/mtd/nand/sunxi_nand.c
> @@ -390,8 +390,8 @@ static int sunxi_nfc_dma_op_prepare(struct mtd_info *mtd, const void *buf,
>  		return -ENOMEM;
>  
>  	dmad = dmaengine_prep_slave_sg(nfc->dmac, sg, 1, tdir, DMA_CTRL_ACK);
> -	if (IS_ERR(dmad)) {
> -		ret = PTR_ERR(dmad);
> +	if (!dmad) {
> +		ret = -EINVAL;
>  		goto err_unmap_buf;
>  	}
> 
> 



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com



More information about the linux-mtd mailing list