drm/msm: Use correct drm_gem_object_put() in fail case
authorRob Clark <robdclark@chromium.org>
Fri, 23 Oct 2020 16:51:11 +0000 (09:51 -0700)
committerRob Clark <robdclark@chromium.org>
Thu, 5 Nov 2020 00:00:56 +0000 (16:00 -0800)
We only want to use the _unlocked() variant in the unlocked case.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/msm_gem.c

index 6935c4437ef9280ed6617088498ec50e9f2d1a1c..a0baea2e96c84cd3891181f054c042cbe92664cf 100644 (file)
@@ -1139,7 +1139,11 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev,
        return obj;
 
 fail:
-       drm_gem_object_put(obj);
+       if (struct_mutex_locked) {
+               drm_gem_object_put_locked(obj);
+       } else {
+               drm_gem_object_put(obj);
+       }
        return ERR_PTR(ret);
 }