diff --git a/msm/sde/sde_encoder_phys_cmd.c b/msm/sde/sde_encoder_phys_cmd.c
index ba5c915468..1ce1994b17 100644
--- a/msm/sde/sde_encoder_phys_cmd.c
+++ b/msm/sde/sde_encoder_phys_cmd.c
@@ -409,7 +409,7 @@ static void sde_encoder_phys_cmd_cont_splash_mode_set(
 					&cmd_enc->autorefresh.cfg);
 		}
 
-		if (hw_intf->ops.reset_counter)
+		if (hw_intf && hw_intf->ops.reset_counter)
 			hw_intf->ops.reset_counter(hw_intf);
 	}
 
diff --git a/msm/sde/sde_plane.c b/msm/sde/sde_plane.c
index a57382b3ca..c8e0fa1d11 100644
--- a/msm/sde/sde_plane.c
+++ b/msm/sde/sde_plane.c
@@ -2347,7 +2347,7 @@ static void _sde_plane_get_max_downscale_limits(struct sde_plane *psde,
 {
 	bool rotated, has_predown, default_scale;
 	const struct sde_sspp_sub_blks *sblk;
-	struct sde_hw_inline_pre_downscale_cfg *pd;
+	struct sde_hw_inline_pre_downscale_cfg *pd = NULL;
 
 	rotated = pstate->rotation & DRM_MODE_ROTATE_90;
 	sblk = psde->pipe_sblk;