From patchwork Tue Jul 19 12:14:48 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: 9237637 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 C010E6075D for ; Tue, 19 Jul 2016 14:31:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B163927569 for ; Tue, 19 Jul 2016 14:31:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5FD62766D; Tue, 19 Jul 2016 14:31:06 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6136727569 for ; Tue, 19 Jul 2016 14:31:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E2346E24C; Tue, 19 Jul 2016 14:30:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 794 seconds by postgrey-1.35 at gabe; Tue, 19 Jul 2016 12:15:20 UTC Received: from m12-12.163.com (m12-12.163.com [220.181.12.12]) by gabe.freedesktop.org (Postfix) with ESMTP id EB9A26E67D for ; Tue, 19 Jul 2016 12:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=/eVTp u9omfOXUHaadj2DL8IyD1gt9CtPMCGDlCZAu3g=; b=RaoFgQ7RSxfDC19Vsy9My klGIVYoLAHX1EB7IX3cMRMwatC6Zhio9iJdrb8gOHJRW4EHWrYrj/dGxu+OvM1aF DC6CB2MN/6gtEVBLrqlDY5IPGKndaF5fZGeztQPJIUG9TI6XAVaX6hi73rzrZ2og bOKdMKFEpFngxHBA6eOYaU= Received: from localhost.localdomain.localdomain (unknown [180.110.255.208]) by smtp8 (Coremail) with SMTP id DMCowABHmci5GY5XaJGBAQ--.39151S2; Tue, 19 Jul 2016 20:14:50 +0800 (CST) From: Wei Yongjun To: alexander.deucher@amd.com, christian.koenig@amd.com, airlied@linux.ie, Flora.Cui@amd.com, David1.Zhou@amd.com, tom.stdenis@amd.com, Jammy.Zhou@amd.com Subject: [PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_regs_init() Date: Tue, 19 Jul 2016 12:14:48 +0000 Message-Id: <1468930488-10230-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CM-TRANSID: DMCowABHmci5GY5XaJGBAQ--.39151S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr4kurWfKr1UGr1rKF18Grg_yoWkWwbEk3 y5ArnrXw1avFnFqrWavr45Zay2qFs0yrW8Wr13tas3t347W3y8XrWUWr1UWw1rWw13CF1D Xan0gr1fA3ZxGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnuMKtUUUUU== X-Originating-IP: [180.110.255.208] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbBDRqr1laDoILMegAAsr X-Mailman-Approved-At: Tue, 19 Jul 2016 14:30:31 +0000 Cc: Wei Yongjun , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun In case of error, the function debugfs_create_*() returns NULL pointer not ERR_PTR() if debugfs is enabled. The IS_ERR() test in the return value check should be replaced with NULL test. (defined(CONFIG_DEBUG_FS) make sure debugfs is enabled) Signed-off-by: Wei Yongjun --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 614fb02..0c992d3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2530,12 +2530,12 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) ent = debugfs_create_file(debugfs_regs_names[i], S_IFREG | S_IRUGO, root, adev, debugfs_regs[i]); - if (IS_ERR(ent)) { + if (!ent) { for (j = 0; j < i; j++) { debugfs_remove(adev->debugfs_regs[i]); adev->debugfs_regs[i] = NULL; } - return PTR_ERR(ent); + return -ENOMEM; } if (!i)