diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 79e7a03de..7e7855151 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -1031,6 +1031,9 @@ unbind:
 	ch->ref_actions_put = 0;
 #endif
 
+	nvgpu_cond_destroy(&ch->notifier_wq);
+	nvgpu_cond_destroy(&ch->semaphore_wq);
+
 	/* make sure we catch accesses of unopened channels in case
 	 * there's non-refcounted channel pointers hanging around */
 	ch->g = NULL;
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index f58877541..32334e522 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -994,6 +994,7 @@ static void nvgpu_vm_remove(struct vm_gk20a *vm)
 	}
 
 	nvgpu_mutex_release(&vm->update_gmmu_lock);
+	nvgpu_mutex_destroy(&vm->update_gmmu_lock);
 
 	nvgpu_mutex_destroy(&vm->syncpt_ro_map_lock);
 	nvgpu_kfree(g, vm);