aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-21 15:05:24 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-21 15:05:24 +0100
commit9e0ae53404700f1e4ae1f33b0ff92948ae0e509d (patch)
tree5ea1ff3b885ea0fcda2cf9336444e8a5e9d2e16f /drivers
parent4fd21dc8ee6fde52a99042186ff94de1b5e8b43c (diff)
downloadkernel_samsung_smdk4412-9e0ae53404700f1e4ae1f33b0ff92948ae0e509d.zip
kernel_samsung_smdk4412-9e0ae53404700f1e4ae1f33b0ff92948ae0e509d.tar.gz
kernel_samsung_smdk4412-9e0ae53404700f1e4ae1f33b0ff92948ae0e509d.tar.bz2
drm/i915: Don't overwrite the returned error-code
During i915_gem_create_mmap_offset() if the subsystem reports an error code, use it. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 151fa43..734cc08 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1246,7 +1246,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj)
obj->size / PAGE_SIZE, 0, 0);
if (!list->file_offset_node) {
DRM_ERROR("failed to allocate offset for bo %d\n", obj->name);
- ret = -ENOMEM;
+ ret = -ENOSPC;
goto out_free_list;
}
@@ -1258,9 +1258,9 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj)
}
list->hash.key = list->file_offset_node->start;
- if (drm_ht_insert_item(&mm->offset_hash, &list->hash)) {
+ ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
+ if (ret) {
DRM_ERROR("failed to add to map hash\n");
- ret = -ENOMEM;
goto out_free_mm;
}