diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c
index 2d539b1128..60d917deb9 100644
--- a/msm/dp/dp_display.c
+++ b/msm/dp/dp_display.c
@@ -851,8 +851,7 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
 	if (dp_display_state_is(DP_STATE_CONNECTED)) {
 		DP_DEBUG("dp already connected, skipping hpd high\n");
 		mutex_unlock(&dp->session_lock);
-		rc = -EISCONN;
-		goto end;
+		return -EISCONN;
 	}
 
 	dp_display_state_add(DP_STATE_CONNECTED);
diff --git a/msm/dp/dp_link.c b/msm/dp/dp_link.c
index eb2f872597..20a09cf9bf 100644
--- a/msm/dp/dp_link.c
+++ b/msm/dp/dp_link.c
@@ -1122,7 +1122,7 @@ static int dp_link_process_link_status_update(struct dp_link_private *link)
 		return -EINVAL;
 
 	DP_DEBUG("channel_eq_done = %d, clock_recovery_done = %d\n",
-			drm_dp_clock_recovery_ok(link->link_status,
+			drm_dp_channel_eq_ok(link->link_status,
 			link->dp_link.link_params.lane_count),
 			drm_dp_clock_recovery_ok(link->link_status,
 			link->dp_link.link_params.lane_count));