1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 85b77199..eae2bdae 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -978,6 +978,10 @@ unbind:
         g->ops.fifo.unbind_channel(ch);
         g->ops.fifo.free_inst(g, ch);
 
+        /* free the channel used semaphore index */
+        if (ch->hw_sema)
+                gk20a_semaphore_free_hw_sema(ch);
+
         ch->vpr = false;
         ch->vm = NULL;
 
@@ -1006,9 +1010,6 @@ unbind:
 
         mutex_unlock(&g->dbg_sessions_lock);
 
-        /* Make sure that when the ch is re-opened it will get a new HW sema. */
-        ch->hw_sema = NULL;
-
         /* make sure we catch accesses of unopened channels in case
          * there's non-refcounted channel pointers hanging around */
         ch->g = NULL;