From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH -next] drm/i915: fix return value check of debugfs_create_file() Date: Mon, 16 Dec 2013 11:05:02 +0100 Message-ID: <20131216100502.GR9804@phenom.ffwll.local> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f50.google.com (mail-ee0-f50.google.com [74.125.83.50]) by gabe.freedesktop.org (Postfix) with ESMTP id 73604F9E3A for ; Mon, 16 Dec 2013 02:04:09 -0800 (PST) Received: by mail-ee0-f50.google.com with SMTP id c41so2086770eek.23 for ; Mon, 16 Dec 2013 02:04:08 -0800 (PST) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Wei Yongjun Cc: airlied@linux.ie, daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, yongjun_wei@trendmicro.com.cn List-Id: intel-gfx@lists.freedesktop.org On Mon, Dec 16, 2013 at 02:13:25PM +0800, Wei Yongjun wrote: > From: Wei Yongjun > > In case of error, the function debugfs_create_file() 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. > > Signed-off-by: Wei Yongjun Nice catch! Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 7008aac..856e18b 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1920,8 +1920,8 @@ static int i915_pipe_crc_create(struct dentry *root, struct drm_minor *minor, > info->dev = dev; > ent = debugfs_create_file(info->name, S_IRUGO, root, info, > &i915_pipe_crc_fops); > - if (IS_ERR(ent)) > - return PTR_ERR(ent); > + if (!ent) > + return -ENOMEM; > > return drm_add_fake_info_node(minor, ent, info); > } > @@ -2931,8 +2931,8 @@ static int i915_forcewake_create(struct dentry *root, struct drm_minor *minor) > S_IRUSR, > root, dev, > &i915_forcewake_fops); > - if (IS_ERR(ent)) > - return PTR_ERR(ent); > + if (!ent) > + return -ENOMEM; > > return drm_add_fake_info_node(minor, ent, &i915_forcewake_fops); > } > @@ -2949,8 +2949,8 @@ static int i915_debugfs_create(struct dentry *root, > S_IRUGO | S_IWUSR, > root, dev, > fops); > - if (IS_ERR(ent)) > - return PTR_ERR(ent); > + if (!ent) > + return -ENOMEM; > > return drm_add_fake_info_node(minor, ent, fops); > } > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch