1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 51b87ac8..e2532593 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -439,7 +439,10 @@ void gk20a_gr_clear_sm_hww(struct gk20a *g,
                 int err = 0; \
                 if (support_gk20a_pmu(g->dev)) \
                         err = gk20a_pmu_disable_elpg(g); \
-                if (err) return err; \
+                if (err) { \
+                        gk20a_pmu_enable_elpg(g); \
+                        return err; \
+                } \
                 err = func; \
                 if (support_gk20a_pmu(g->dev)) \
                         gk20a_pmu_enable_elpg(g); \