p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Correct error handling for i915_gem_object_create_from_data() 

i915_gem_object_create_from_data() always returns an error pointer on
failure, there is no need to check against NULL.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170317205317.7885-1-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
This commit is contained in:
Chris Wilson 2017-03-17 20:53:17 +00:00
parent ce8ff099c4
commit f3ddd2c14f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/intel_uc.c
View File

@ -377,8 +377,8 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size); obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size);
if (IS_ERR_OR_NULL(obj)) { if (IS_ERR(obj)) {
err = obj ? PTR_ERR(obj) : -ENOMEM; err = PTR_ERR(obj);
goto fail; goto fail;
} }