mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Merge "disp: msm: dp: skip wait if audio engine is disabled"
This commit is contained in:
commit
bd355c786d
1 changed files with 8 additions and 2 deletions
|
|
@ -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,8 +674,11 @@ static int dp_audio_notify(struct dp_audio_private *audio, u32 state)
|
|||
if (atomic_read(&audio->acked))
|
||||
goto end;
|
||||
|
||||
if (state == EXT_DISPLAY_CABLE_CONNECT)
|
||||
goto end;
|
||||
if (state == EXT_DISPLAY_CABLE_DISCONNECT && !audio->engine_on)
|
||||
goto end;
|
||||
|
||||
if (state == EXT_DISPLAY_CABLE_CONNECT)
|
||||
goto end;
|
||||
|
||||
rc = wait_for_completion_timeout(&audio->hpd_comp, HZ * 4);
|
||||
if (!rc) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue