1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index d99dc087f9b1..9537f3e30115 100644
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c
@@ -61,11 +61,8 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan)
 
         chan->notifier_bo = ntfy;
 out_err:
-        if (ret) {
-                mutex_lock(&dev->struct_mutex);
-                drm_gem_object_unreference(ntfy->gem);
-                mutex_unlock(&dev->struct_mutex);
-        }
+        if (ret)
+                drm_gem_object_unreference_unlocked(ntfy->gem);
 
         return ret;
 }
@@ -81,8 +78,8 @@ nouveau_notifier_takedown_channel(struct nouveau_channel *chan)
         nouveau_bo_unmap(chan->notifier_bo);
         mutex_lock(&dev->struct_mutex);
         nouveau_bo_unpin(chan->notifier_bo);
-        drm_gem_object_unreference(chan->notifier_bo->gem);
         mutex_unlock(&dev->struct_mutex);
+        drm_gem_object_unreference_unlocked(chan->notifier_bo->gem);
         nouveau_mem_takedown(&chan->notifier_heap);
 }