drm/i915: checking for NULL instead of IS_ERR()

PATCH In review Dan Carpenter 1 participant 1 message Jul 19, 2013

Subsystems (3)

DRM drivers Intel i915 Kernel janitors

lore

Share & tools

lore

Dan Carpenter

author

2013-07-19 05:45 UTC #0 lore raw

PATCH 1/2 drm/i915: checking for NULL instead of IS_ERR()

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

Signed-off-by Dan Carpenter <[email protected]>

drivers/gpu/drm/i915/i915_gem.c +2 -2

index 40c2fc6..9a9a77a 100644
@@ -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:

drivers/gpu/drm/i915/i915_gem_stolen.c +2 -2

index f526136..27ffb4c 100644
@@ -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;
 	}