Merge "disp: msm: dp: do not skip disconnect when host is unready" (5391d25f) · Commits · e / devices / android_kernel_fairphone_FP5

msm/dp/dp_display.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;