Commit f3c5fe97 authored by Wei Yongjun's avatar Wei Yongjun Committed by Daniel Vetter

drm/i915: fix return value check of debugfs_create_file()

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f00076d2
...@@ -2117,8 +2117,8 @@ static int i915_pipe_crc_create(struct dentry *root, struct drm_minor *minor, ...@@ -2117,8 +2117,8 @@ static int i915_pipe_crc_create(struct dentry *root, struct drm_minor *minor,
info->dev = dev; info->dev = dev;
ent = debugfs_create_file(info->name, S_IRUGO, root, info, ent = debugfs_create_file(info->name, S_IRUGO, root, info,
&i915_pipe_crc_fops); &i915_pipe_crc_fops);
if (IS_ERR(ent)) if (!ent)
return PTR_ERR(ent); return -ENOMEM;
return drm_add_fake_info_node(minor, ent, info); return drm_add_fake_info_node(minor, ent, info);
} }
...@@ -3133,8 +3133,8 @@ static int i915_forcewake_create(struct dentry *root, struct drm_minor *minor) ...@@ -3133,8 +3133,8 @@ static int i915_forcewake_create(struct dentry *root, struct drm_minor *minor)
S_IRUSR, S_IRUSR,
root, dev, root, dev,
&i915_forcewake_fops); &i915_forcewake_fops);
if (IS_ERR(ent)) if (!ent)
return PTR_ERR(ent); return -ENOMEM;
return drm_add_fake_info_node(minor, ent, &i915_forcewake_fops); return drm_add_fake_info_node(minor, ent, &i915_forcewake_fops);
} }
...@@ -3151,8 +3151,8 @@ static int i915_debugfs_create(struct dentry *root, ...@@ -3151,8 +3151,8 @@ static int i915_debugfs_create(struct dentry *root,
S_IRUGO | S_IWUSR, S_IRUGO | S_IWUSR,
root, dev, root, dev,
fops); fops);
if (IS_ERR(ent)) if (!ent)
return PTR_ERR(ent); return -ENOMEM;
return drm_add_fake_info_node(minor, ent, fops); return drm_add_fake_info_node(minor, ent, fops);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment