Commit 3a893113 authored by Dan Carpenter's avatar Dan Carpenter Committed by Nirmoy Das
Browse files

drm/i915: Fix a NULL vs IS_ERR() bug 



The mmap_offset_attach() function returns error pointers, it doesn't
return NULL.

Fixes: eaee1c08 ("drm/i915: Add a function to mmap framebuffer obj")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZH7tHLRZ9oBjedjN@moroto
parent 8084c637

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+2 −2
Original line number Diff line number Diff line
@@ -1085,8 +1085,8 @@ int i915_gem_fb_mmap(struct drm_i915_gem_object *obj, struct vm_area_struct *vma 
		/* handle stolen and smem objects */

		mmap_type = i915_ggtt_has_aperture(ggtt) ? I915_MMAP_TYPE_GTT : I915_MMAP_TYPE_WC;

		mmo = mmap_offset_attach(obj, mmap_type, NULL);

		if (!mmo)

			return -ENODEV;

		if (IS_ERR(mmo))

			return PTR_ERR(mmo);

	}



	/*