Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3ddd2c1 authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170317205317.7885-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent ce8ff099

drivers/gpu/drm/i915/intel_uc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}