leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Dan Carpenter 2013-07-19 08:45:46 +03:00 committed by Daniel Vetter
parent bf8fa3d383
commit db473b36d4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_gem.c
View File

@ -3134,9 +3134,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:

4
drivers/gpu/drm/i915/i915_gem_stolen.c
View File

@ -392,8 +392,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;
}