mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=28f3d01eca5269b01e33c1bf976d90c33b546ad9
Commit:     28f3d01eca5269b01e33c1bf976d90c33b546ad9
Parent:     bc265323deace1f1472832a87458688796318c47
Author:     Wei Yongjun <yongjun_wei at trendmicro.com.cn>
AuthorDate: Mon Jun 13 14:27:18 2016 +0000
Committer:  Boris Brezillon <boris.brezillon at free-electrons.com>
CommitDate: Mon Jul 11 08:39:53 2016 +0200

    mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()
    
    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>
    Fixes: 614049a8d904 ("mtd: nand: sunxi: add support for DMA assisted operations")
    Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 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;
 	}