From patchwork Wed Jul 6 12:19:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: weiyj_lk@163.com X-Patchwork-Id: 9216277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E1C260752 for ; Wed, 6 Jul 2016 12:19:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E557286F3 for ; Wed, 6 Jul 2016 12:19:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01809286F5; Wed, 6 Jul 2016 12:19:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6047286F3 for ; Wed, 6 Jul 2016 12:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751622AbcGFMTV (ORCPT ); Wed, 6 Jul 2016 08:19:21 -0400 Received: from m12-11.163.com ([220.181.12.11]:36930 "EHLO m12-11.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbcGFMTU (ORCPT ); Wed, 6 Jul 2016 08:19:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=GtsSU fA8K3DQdSglCFOQDu848Fb/G09mwNumTVC4nSM=; b=MXl/EfUjGum97l/nJ+i02 I3d87YwdTkntEu7VxKkJNV0VGsr5lxEJHTs/2gwRKUAAuC3KpIleR8opyNSdJNmD 92h89IHAz0Qg8n+d5r2Iuzyo75VMQWyAwuRkTwbRnhGEOQVAONEHrFSeQHcN3a95 Ee5iAysmuuqTpnG0I1VFAg= Received: from localhost.localdomain.localdomain (unknown [49.77.207.185]) by smtp7 (Coremail) with SMTP id C8CowABXayU+93xXq94GBw--.50801S2; Wed, 06 Jul 2016 20:19:10 +0800 (CST) From: weiyj_lk@163.com To: Vinod Koul , Sinan Kaya , Dan Williams Cc: Wei Yongjun , dmaengine@vger.kernel.org Subject: [PATCH -next] dmaengine: qcom_hidma: fix return value check in hidma_mgmt_of_populate_channels() Date: Wed, 6 Jul 2016 12:19:09 +0000 Message-Id: <1467807549-31813-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CM-TRANSID: C8CowABXayU+93xXq94GBw--.50801S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4DZF4DJr4ftF1rXryUAwb_yoWDGrb_K3 98urZrZr4v9F4SyFWYkr4Yv3sIvFyDZFs3Wrn7Ka4aqFy5Xrs8JrZ8ArykJr18uF4DCFZY kwnYgryrCF1xKjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUn9Sd3UUUUU== X-Originating-IP: [49.77.207.185] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/1tbiMB6e1lWBW7gXzQAAsL Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun In case of error, the function platform_device_register_full() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun --- drivers/dma/qcom/hidma_mgmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/dma/qcom/hidma_mgmt.c b/drivers/dma/qcom/hidma_mgmt.c index c0e3653..6416ded 100644 --- a/drivers/dma/qcom/hidma_mgmt.c +++ b/drivers/dma/qcom/hidma_mgmt.c @@ -371,8 +371,8 @@ static int __init hidma_mgmt_of_populate_channels(struct device_node *np) pdevinfo.size_data = 0; pdevinfo.dma_mask = DMA_BIT_MASK(64); new_pdev = platform_device_register_full(&pdevinfo); - if (!new_pdev) { - ret = -ENODEV; + if (IS_ERR(new_pdev)) { + ret = PTR_ERR(new_pdev); goto out; } of_dma_configure(&new_pdev->dev, child);