[patch 1/2] drm/i915: checking for NULL instead of IS_ERR()

[Dan Carpenter]

i915_gem_vma_create() returns and ERR_PTR() or a valid pointer, it never
returns NULL.

Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 40c2fc6..9a9a77a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3113,9 +3113,9 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object 
*obj,
        i915_gem_object_pin_pages(obj);
 
        vma = i915_gem_vma_create(obj, &dev_priv->gtt.base);
-       if (vma == NULL) {
+       if (IS_ERR(vma)) {
                i915_gem_object_unpin_pages(obj);
-               return -ENOMEM;
+               return PTR_ERR(vma);
        }
 
 search_free:
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c 
b/drivers/gpu/drm/i915/i915_gem_stolen.c
index f526136..27ffb4c 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -395,8 +395,8 @@ i915_gem_object_create_stolen_for_preallocated(struct 
drm_device *dev,
                return obj;
 
        vma = i915_gem_vma_create(obj, &dev_priv->gtt.base);
-       if (!vma) {
-               ret = -ENOMEM;
+       if (IS_ERR(vma)) {
+               ret = PTR_ERR(vma);
                goto err_out;
        }
 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel