diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-17 20:53:17 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-17 22:54:40 +0000 |
| commit | f3ddd2c14fdc08798a7fa2d32b39786585162f50 (patch) | |
| tree | 134fff1f54681bda557716b14f0fcb74eab44dff /drivers/gpu/drm/i915/intel_uc.c | |
| parent | drm/i915: i915_gem_object_create_from_data() doesn't require struct_mutex (diff) | |
| download | linux-dev-f3ddd2c14fdc08798a7fa2d32b39786585162f50.tar.xz linux-dev-f3ddd2c14fdc08798a7fa2d32b39786585162f50.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 86530c92337a..d15a7d9d4eb0 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -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); obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size); - if (IS_ERR_OR_NULL(obj)) { - err = obj ? PTR_ERR(obj) : -ENOMEM; + if (IS_ERR(obj)) { + err = PTR_ERR(obj); goto fail; } |