From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424128AbcFMO3T (ORCPT ); Mon, 13 Jun 2016 10:29:19 -0400 Received: from m12-18.163.com ([220.181.12.18]:38058 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422860AbcFMO3S (ORCPT ); Mon, 13 Jun 2016 10:29:18 -0400 From: weiyj_lk@163.com To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Maxime Ripard , Chen-Yu Tsai Cc: Wei Yongjun , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare() Date: Mon, 13 Jun 2016 14:27:18 +0000 Message-Id: <1465828038-16893-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CM-TRANSID: EsCowECJykHFwl5XQqciAA--.12294S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kZF43tFy3GFWxXr1rtFb_yoWfWrg_Wr 9I9rn7GrnF9F93tFySkr13Aryayw4DXrs7Wa4Fg3y3JayqqryfJ34DAwn8CF1xGFZ7AFZx C3sYy34Syw17GjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnGFAJUUUUU== X-Originating-IP: [180.102.102.213] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiGQiH1lXlTVRrHAAAse Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun 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 --- 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; }