diff --git a/drivers/gpu/nvgpu/gp10b/Makefile b/drivers/gpu/nvgpu/gp10b/Makefile
index 3575d4146..e897ab9c0 100644
--- a/drivers/gpu/nvgpu/gp10b/Makefile
+++ b/drivers/gpu/nvgpu/gp10b/Makefile
@@ -7,6 +7,7 @@ ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
 ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi
 
 ccflags-$(CONFIG_GK20A) += -Wno-multichar
+ccflags-y += -Werror
 
 obj-$(CONFIG_GK20A)  += \
 	gr_gp10b.o  \
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index e3d4b9735..271a6d0c0 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -571,11 +571,12 @@ int gr_gp10b_alloc_gr_ctx(struct gk20a *g,
 		(*gr_ctx)->preempt_mode = flags;
 	}
 
-	if (class == PASCAL_COMPUTE_A)
+	if (class == PASCAL_COMPUTE_A) {
 		if (flags == NVGPU_GR_PREEMPTION_MODE_CILP)
 			(*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CILP;
 		else
 			(*gr_ctx)->preempt_mode = NVGPU_GR_PREEMPTION_MODE_CTA;
+	}
 
 	gk20a_dbg_fn("done");