diff --git a/driver/vidc/src/msm_vidc_driver.c b/driver/vidc/src/msm_vidc_driver.c
index d248707f57..7ab506d026 100644
--- a/driver/vidc/src/msm_vidc_driver.c
+++ b/driver/vidc/src/msm_vidc_driver.c
@@ -5727,6 +5727,7 @@ void msm_vidc_destroy_buffers(struct msm_vidc_inst *inst)
 	list_for_each_entry_safe(timer, dummy_timer, &inst->input_timer_list, list) {
 		i_vpr_e(inst, "%s: removing input_timer %lld\n",
 			__func__, timer->time_us);
+		list_del(&timer->list);
 		msm_memory_pool_free(inst, timer);
 	}
 
diff --git a/driver/vidc/src/msm_vidc_v4l2.c b/driver/vidc/src/msm_vidc_v4l2.c
index 61943a6880..9dcadd7085 100644
--- a/driver/vidc/src/msm_vidc_v4l2.c
+++ b/driver/vidc/src/msm_vidc_v4l2.c
@@ -381,8 +381,8 @@ int msm_v4l2_create_bufs(struct file *filp, void *fh,
 		return -EINVAL;
 	}
 
-	inst_lock(inst, __func__);
 	client_lock(inst, __func__);
+	inst_lock(inst, __func__);
 	rc = msm_vidc_create_bufs((void *)inst, b);
 	if (rc)
 		goto unlock;