diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
| commit | caa70ccf8cc719acb0540b558b4e075796778db8 (patch) | |
| tree | e8173307b04eca62168415be04e7800bdf011f80 /sound/core/pcm_lib.c | |
| parent | 56d667f87e81d15d43f264007322f1179ce1722e (diff) | |
| parent | 3ec10cd8b526c6b10170c2649002672ee2019e73 (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntuu2
Diffstat (limited to 'sound/core/pcm_lib.c')
| -rw-r--r-- | sound/core/pcm_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 7be95de6eea..c80d36ffd6b 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -375,6 +375,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, } if (runtime->no_period_wakeup) { + snd_pcm_sframes_t xrun_threshold; /* * Without regular period interrupts, we have to check * the elapsed time to detect xruns. @@ -383,7 +384,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, if (jdelta < runtime->hw_ptr_buffer_jiffies / 2) goto no_delta_check; hdelta = jdelta - delta * HZ / runtime->rate; - while (hdelta > runtime->hw_ptr_buffer_jiffies / 2 + 1) { + xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1; + while (hdelta > xrun_threshold) { delta += runtime->buffer_size; hw_base += runtime->buffer_size; if (hw_base >= runtime->boundary) |