Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 132751
b: refs/heads/master
c: 5f513e1
h: refs/heads/master
i:
  132749: 2d6808d
  132747: d82ded8
  132743: f25fe0d
  132735: b30c5ff
v: v3
  • Loading branch information
Takashi Iwai committed Mar 19, 2009
1 parent eed64b7 commit cf47a2b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 98204646f2b15d368701265e4194b773a6f94600
refs/heads/master: 5f513e1197f27e9a0bcfec0feaac59f976f4a37e
10 changes: 7 additions & 3 deletions trunk/sound/core/pcm_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,15 @@ snd_pcm_update_hw_ptr_pos(struct snd_pcm_substream *substream,
pos = substream->ops->pointer(substream);
if (pos == SNDRV_PCM_POS_XRUN)
return pos; /* XRUN */
#ifdef CONFIG_SND_DEBUG
if (pos >= runtime->buffer_size) {
snd_printk(KERN_ERR "BUG: stream = %i, pos = 0x%lx, buffer size = 0x%lx, period size = 0x%lx\n", substream->stream, pos, runtime->buffer_size, runtime->period_size);
if (printk_ratelimit()) {
snd_printd(KERN_ERR "BUG: stream = %i, pos = 0x%lx, "
"buffer size = 0x%lx, period size = 0x%lx\n",
substream->stream, pos, runtime->buffer_size,
runtime->period_size);
}
pos = 0;
}
#endif
pos -= pos % runtime->min_align;
return pos;
}
Expand Down

0 comments on commit cf47a2b

Please sign in to comment.