| Message ID | CAPgLHd-C925=6rEnQMMkPvHu6+w_BHcJ1-CG8PdK37XM9dzf_A@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Dec 16, 2013 at 02:13:25PM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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 <yongjun_wei@trendmicro.com.cn> 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); > } >
On Mon, Dec 16, 2013 at 02:13:25PM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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 <yongjun_wei@trendmicro.com.cn> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
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); }