diff --git a/drivers/gpu/nvgpu/common/nvlink/init/device_reginit_gv100.c b/drivers/gpu/nvgpu/common/nvlink/init/device_reginit_gv100.c
index 7cc612135..eaba055ba 100644
--- a/drivers/gpu/nvgpu/common/nvlink/init/device_reginit_gv100.c
+++ b/drivers/gpu/nvgpu/common/nvlink/init/device_reginit_gv100.c
@@ -122,6 +122,8 @@ static const struct nvlink_reginit nvlink_reginit_per_link_gpu[] = {
 static int gv100_nvlink_get_tlc_reginit(enum nvgpu_nvlink_endp endp,
 		struct nvlink_reginit **reg, u32 *count)
 {
+	int ret = 0;
+
 	switch(endp) {
 	case nvgpu_nvlink_endp_tegra:
 		*reg = (struct nvlink_reginit *)
@@ -134,10 +136,11 @@ static int gv100_nvlink_get_tlc_reginit(enum nvgpu_nvlink_endp endp,
 		*count = ARRAY_SIZE(nvlink_reginit_per_link_gpu);
 		break;
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
+		break;
 	}
 
-	return 0;
+	return ret;
 }
 
 int gv100_nvlink_reg_init(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c b/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c
index 56417f9b7..cbb838bf3 100644
--- a/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c
@@ -1397,7 +1397,8 @@ int gv100_nvlink_link_set_mode(struct gk20a *g, u32 link_id, u32 mode)
 		/* 1/8 th mode not supported */
 	case nvgpu_nvlink_link_enable_pm:
 	case nvgpu_nvlink_link_disable_pm:
-		return -EPERM;
+		err = -EPERM;
+		break;
 	case nvgpu_nvlink_link_disable_err_detect:
 		/* Disable Link interrupts */
 		g->ops.nvlink.intr.dlpl_intr_enable(g, link_id, false);
@@ -1603,6 +1604,8 @@ int gv100_nvlink_link_set_sublink_mode(struct gk20a *g, u32 link_id,
 			return -EINVAL;
 		}
 		nvgpu_err(g, "MODE %u", mode);
+		err = -EPERM;
+		break;
 	}
 
 	if (err != 0) {