From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751073AbcGNMIT (ORCPT ); Thu, 14 Jul 2016 08:08:19 -0400 Received: from m12-17.163.com ([220.181.12.17]:35272 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750739AbcGNMIR (ORCPT ); Thu, 14 Jul 2016 08:08:17 -0400 From: weiyj_lk@163.com To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , "Cooper Jr., Franklin" Cc: Wei Yongjun , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] mtd: nand: omap2: fix return value check in omap_nand_probe() Date: Thu, 14 Jul 2016 12:06:45 +0000 Message-Id: <1468498005-10664-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CM-TRANSID: EcCowABXFldWgIdXEK4BAA--.539S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kCr4xAF18KFy8tF1rXrb_yoWDZrb_Cw 13Zrn2gr9rGryIy3WIgw45Ary3JayDWw4kWFnIgay3KasxKr13J34qvrnxurW8urW0yFs8 A34rZryfCrnxGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnED7DUUUUU== X-Originating-IP: [49.77.206.143] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbByham1lO+kgCXtAAAsw 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 dma_request_chan() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: aa7abd312c11 ('mtd: nand: omap2: Support parsing dma channel information from DT') Signed-off-by: Wei Yongjun --- drivers/mtd/nand/omap2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index a36ad3d..26fbe29 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1922,9 +1922,9 @@ static int omap_nand_probe(struct platform_device *pdev) dma_cap_set(DMA_SLAVE, mask); info->dma = dma_request_chan(pdev->dev.parent, "rxtx"); - if (!info->dma) { + if (IS_ERR(info->dma)) { dev_err(&pdev->dev, "DMA engine request failed\n"); - err = -ENXIO; + err = PTR_ERR(info->dma); goto return_error; } else { struct dma_slave_config cfg;