diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 11:27:50 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 11:27:50 +0300 |
| commit | 984a8547052711867332eeaec4141755fc040553 (patch) | |
| tree | c8bbc1e16d11c023e1a7ec0421401be0a0e4a304 /sound/core | |
| parent | 3270f0dd1a35d6b785bf39e1ed7ed6e1e43c8ebb (diff) | |
| parent | b47eee2e0a7de623c24dbcaf303c3bf2b5155455 (diff) | |
| download | linux-984a8547052711867332eeaec4141755fc040553.tar.xz | |
Merge branch 'for-linus' into for-next
Merge back the latest HD-audio stuff for further development.
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index ac6b33f3779c..7d45645f10ba 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -339,7 +339,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, if (delta > new_hw_ptr) { /* check for double acknowledged interrupts */ hdelta = curr_jiffies - runtime->hw_ptr_jiffies; - if (hdelta > runtime->hw_ptr_buffer_jiffies/2) { + if (hdelta > runtime->hw_ptr_buffer_jiffies/2 + 1) { hw_base += runtime->buffer_size; if (hw_base >= runtime->boundary) { hw_base = 0; |