From cfca510d586431c42f16c49394d47d2219d5fc32 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Fri, 22 Sep 2006 04:18:37 +1000 Subject: [PATCH] --- yaml --- r: 37521 b: refs/heads/master c: e08870c87ab5b0c0c3cb05d0d0041240736493e4 h: refs/heads/master i: 37519: 4c706669b26ef662cd98b45468d9460a7948456c v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_bufs.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8ef5d9bcf30b..3fe81a9f04f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 214ff13d9ebbba7940f29bc89669f85f12533083 +refs/heads/master: e08870c87ab5b0c0c3cb05d0d0041240736493e4 diff --git a/trunk/drivers/char/drm/drm_bufs.c b/trunk/drivers/char/drm/drm_bufs.c index 03c6db9029cf..029baea33b62 100644 --- a/trunk/drivers/char/drm/drm_bufs.c +++ b/trunk/drivers/char/drm/drm_bufs.c @@ -77,14 +77,16 @@ static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, #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); } /**