diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 40394f4e..7fa8919c 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1108,13 +1108,13 @@ static int dsi_panel_parse_triggers(struct dsi_host_common_cfg *host,
 		} else if (!strcmp(trig, "trigger_sw_te")) {
 			host->dma_cmd_trigger = DSI_TRIGGER_SW_TE;
 		} else {
-			DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n",
+			DSI_ERR("[%s] Unrecognized cmd dma trigger type (%s)\n",
 			       name, trig);
 			rc = -EINVAL;
 		}
 
 	} else {
-		DSI_DEBUG("[%s] Falling back to default MDP trigger\n", name);
+		DSI_DEBUG("[%s] Falling back to default cmd dma trigger\n", name);
 		host->dma_cmd_trigger = DSI_TRIGGER_SW;
 	}
 
diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c
index b06ffe37..7b829611 100644
--- a/msm/sde/sde_encoder.c
+++ b/msm/sde/sde_encoder.c
@@ -3323,7 +3323,8 @@ static void sde_encoder_wait_for_vsync_event_complete(struct sde_encoder_virt *s
 	if (!ret) {
 		SDE_ERROR("vsync event complete timed out %d\n", ret);
 		SDE_EVT32(ret, SDE_EVTLOG_ERROR);
-		for (i = 0; i < sde_enc->num_phys_encs; i++) {
+		for (i = 0; (i < sde_enc->num_phys_encs &&
+			i < ARRAY_SIZE(sde_enc->phys_encs)) ; i++) {
 			struct sde_encoder_phys *phys = sde_enc->phys_encs[i];
 
 			if (phys && phys->ops.control_vblank_irq)