1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 6a32d727..821951ad 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -118,12 +118,22 @@ static int gk20a_dbg_gpu_do_dev_open(struct inode *inode,
 
         init_waitqueue_head(&dbg_session->dbg_events.wait_queue);
         INIT_LIST_HEAD(&dbg_session->ch_list);
-        nvgpu_mutex_init(&dbg_session->ch_list_lock);
-        nvgpu_mutex_init(&dbg_session->ioctl_lock);
+        err = nvgpu_mutex_init(&dbg_session->ch_list_lock);
+        if (err)
+                goto err_free_session;
+        err = nvgpu_mutex_init(&dbg_session->ioctl_lock);
+        if (err)
+                goto err_destroy_lock;
         dbg_session->dbg_events.events_enabled = false;
         dbg_session->dbg_events.num_pending_events = 0;
 
         return 0;
+
+err_destroy_lock:
+        nvgpu_mutex_destroy(&dbg_session->ch_list_lock);
+err_free_session:
+        kfree(dbg_session);
+        return err;
 }
 
 /* used in scenarios where the debugger session can take just the inter-session
@@ -480,6 +490,9 @@ int gk20a_dbg_gpu_dev_release(struct inode *inode, struct file *filp)
         nvgpu_dbg_timeout_enable(dbg_s, NVGPU_DBG_GPU_IOCTL_TIMEOUT_ENABLE);
         nvgpu_mutex_release(&g->dbg_sessions_lock);
 
+        nvgpu_mutex_destroy(&dbg_s->ch_list_lock);
+        nvgpu_mutex_destroy(&dbg_s->ioctl_lock);
+
         kfree(dbg_s);
         return 0;
 }