Explorar o código

Merge "disp: msm: dp: do not skip disconnect when host is unready"

qctecmdr %!s(int64=4) %!d(string=hai) anos
pai
achega
5391d25fbc
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      msm/dp/dp_display.c

+ 2 - 1
msm/dp/dp_display.c

@@ -1363,7 +1363,8 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev)
 			dp->debug->psm_enabled);
 
 	/* skip if a disconnect is already in progress */
-	if (dp_display_state_is(DP_STATE_ABORTED)) {
+	if (dp_display_state_is(DP_STATE_ABORTED) &&
+	    dp_display_state_is(DP_STATE_READY)) {
 		DP_DEBUG("disconnect already in progress\n");
 		SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_CASE1, dp->state);
 		return 0;