Merge "disp: msm: dp: skip wait if audio engine is disabled" (bd355c78) · Commits · e / devices / android_kernel_fairphone_FP5

msm/dp/dp_audio.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -414,6 +414,9 @@ static int dp_audio_info_setup(struct platform_device *pdev,
		dp_audio_enable(audio, true);

		mutex_unlock(&audio->ops_lock);

		DP_DEBUG("audio stream configured\n");

		return rc;
		}

		@@ -671,6 +674,9 @@ static int dp_audio_notify(struct dp_audio_private *audio, u32 state)
		if (atomic_read(&audio->acked))
		goto end;

		if (state == EXT_DISPLAY_CABLE_DISCONNECT && !audio->engine_on)
		goto end;

		if (state == EXT_DISPLAY_CABLE_CONNECT)
		goto end;