commit e08870c87ab5b0c0c3cb05d0d0041240736493e4
author Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> Fri Sep 22 04:18:37 2006 +1000
committer Dave Airlie <airlied@linux.ie> Fri Sep 22 05:32:34 2006 +1000
tree fcc53c55b955143793187aad54d331f2e8f7a49a
parent 214ff13d9ebbba7940f29bc89669f85f12533083

drm: allow multiple addMaps with the same 32-bit map offsset.

Reported on -mm kernels.

Signed-off-by: Dave Airlie <airlied@linux.ie>

drivers/char/drm/drm_bufs.c

diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 03c6db9..029baea 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -77,14 +77,16 @@
 #error Unsupported long size. Neither 64 nor 32 bits.
 #endif
 
-	if (use_hashed_handle) {
-		return drm_ht_just_insert_please(&dev->map_hash, hash,
-						 user_token, 32 - PAGE_SHIFT - 3,
-						 PAGE_SHIFT, DRM_MAP_HASH_OFFSET);
-	} else {
+	if (!use_hashed_handle) {
+		int ret;
 		hash->key = user_token;
-		return drm_ht_insert_item(&dev->map_hash, hash);
+		ret = drm_ht_insert_item(&dev->map_hash, hash);
+		if (ret != -EINVAL)
+			return ret;
 	}
+	return drm_ht_just_insert_please(&dev->map_hash, hash,
+					 user_token, 32 - PAGE_SHIFT - 3,
+					 PAGE_SHIFT, DRM_MAP_HASH_OFFSET);
 }
 
 /**