evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ALSA: pcm: fix blocking while loop in snd_pcm_update_hw_ptr0()"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-03 06:26:56 -08:00 • committed by Gerrit - the friendly Code Review server
commit 376ee68bbf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/core/pcm_lib.c
View file

@ -375,7 +375,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
* the elapsed time to detect xruns.
*/
jdelta = curr_jiffies - runtime->hw_ptr_jiffies;
if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)
if ((jdelta < runtime->hw_ptr_buffer_jiffies / 2) ||
(runtime->hw_ptr_buffer_jiffies <= 0))
goto no_delta_check;
hdelta = jdelta - delta * HZ / runtime->rate;
xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1;