1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index 9bcfa14e..f86dc2c2 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -171,6 +171,8 @@ void nvgpu_kill_task_pg_init(struct gk20a *g)
                         nvgpu_udelay(2);
                 } while (nvgpu_timeout_expired_msg(&timeout,
                         "timeout - waiting PMU state machine thread stop") == 0);
+        } else {
+                nvgpu_thread_join(&pmu->pg_init.state_task);
         }
 }