From 9cb06f9b21c1f40bcd28fd7c4c850c6fe4b8b1dc Mon Sep 17 00:00:00 2001 From: Krishna Manikandan Date: Thu, 28 May 2020 16:51:45 +0530 Subject: [PATCH] disp: msm: avoid unlocking mutex_lock twice Remove mutex unlock from msm_gem_get_iova_locked as acquiring and releasing the lock are handled in the caller function. Change-Id: Ie4a8408d3e6308d19eb26aafee8dfe15bcb682da Signed-off-by: Krishna Manikandan --- msm/msm_gem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/msm/msm_gem.c b/msm/msm_gem.c index d9cd8c9f7344..fbc8bc616c60 100644 --- a/msm/msm_gem.c +++ b/msm/msm_gem.c @@ -449,7 +449,8 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, if (IS_ERR(obj->import_attach)) { DRM_ERROR("dma_buf_attach failure, err=%ld\n", PTR_ERR(obj->import_attach)); - goto unlock; + ret = PTR_ERR(obj->import_attach); + return ret; } msm_obj->obj_dirty = false; reattach = true; @@ -462,14 +463,14 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, if (ret) { DRM_ERROR("delayed dma-buf import failed %d\n", ret); - goto unlock; + return ret; } } vma = add_vma(obj, aspace); if (IS_ERR(vma)) { ret = PTR_ERR(vma); - goto unlock; + return ret; } pages = get_pages(obj); @@ -493,13 +494,10 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, mutex_unlock(&aspace->list_lock); } - mutex_unlock(&msm_obj->lock); return 0; fail: del_vma(vma); -unlock: - mutex_unlock(&msm_obj->lock); return ret; } static int msm_gem_pin_iova(struct drm_gem_object *obj,