diff --git a/driver/platform/waipio/src/msm_vidc_waipio.c b/driver/platform/waipio/src/msm_vidc_waipio.c
index dedf2520a2..3a79df5afc 100644
--- a/driver/platform/waipio/src/msm_vidc_waipio.c
+++ b/driver/platform/waipio/src/msm_vidc_waipio.c
@@ -1020,7 +1020,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
 		{0},
 		{0},
-		NULL, msm_vidc_set_u32_enum},
+		NULL, msm_vidc_set_level},
 
 	{LEVEL, DEC, HEVC|HEIC,
 		V4L2_MPEG_VIDEO_HEVC_LEVEL_1,
@@ -1066,7 +1066,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
 		{0},
 		{0},
-		NULL, msm_vidc_set_u32_enum},
+		NULL, msm_vidc_set_level},
 
 	/* TODO: Bring the VP9 Level upstream GKI change, and level cap here:
 	 *	go/videogki
diff --git a/driver/vidc/src/msm_vidc_control.c b/driver/vidc/src/msm_vidc_control.c
index 3bb8c0bf11..ec3df2714d 100644
--- a/driver/vidc/src/msm_vidc_control.c
+++ b/driver/vidc/src/msm_vidc_control.c
@@ -3026,11 +3026,6 @@ int msm_vidc_set_csc_custom_matrix(void *instance,
 	return rc;
 }
 
-/*
- * TODO: currently fw does not accept HFI_LEVEL_NONE.
- * Use this function for encoder level setting once
- * fw issue is fixed.
- */
 int msm_vidc_set_level(void *instance,
 	enum msm_vidc_inst_capability_type cap_id)
 {