From c11dcbf65ee22f6fc3e45a7b27778fc5e9bddd12 Mon Sep 17 00:00:00 2001 From: Tatenda Chipeperekwa Date: Mon, 9 Sep 2019 13:13:58 -0700 Subject: [PATCH] disp: msm: dp: fix locking in hotplug processing Return immediately after releasing the lock if the connect event has already been processed. Change-Id: I80552b4c569d436ec85a945f4ddc3d389e3af43f Signed-off-by: Tatenda Chipeperekwa --- msm/dp/dp_display.c | 3 +-- msm/dp/dp_link.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c index 0693c0208f..68eb7eadf5 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));