Home Explore Help
Sign In
samsung-sm8650
/
android_kernel_samsung_sm8650-modules
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge "disp: msm: dp: fix locking in hotplug processing"

qctecmdr 5 years ago
parent
d89ef9471c c11dcbf65e
commit
d31d35ca72
2 changed files with 2 additions and 3 deletions
Split View Show Diff Stats
  1. 1 2
      msm/dp/dp_display.c
  2. 1 1
      msm/dp/dp_link.c

+ 1 - 2
msm/dp/dp_display.c
View File 

@@ -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);

+ 1 - 1
msm/dp/dp_link.c
View File 

@@ -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));