From cf47a2b0a3d925137422a2841361c1bf407fb169 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 19 Mar 2009 10:01:47 +0100 Subject: [PATCH] --- yaml --- r: 132751 b: refs/heads/master c: 5f513e1197f27e9a0bcfec0feaac59f976f4a37e h: refs/heads/master i: 132749: 2d6808d67cb8befb3ecfe5b5dbdb6b6bcbe7c880 132747: d82ded8e0467fc9578c7f63ac0744097c99bed3a 132743: f25fe0da173264a6baaff7e1406422b5ace299f4 132735: b30c5ffdca0dcab9ab2ac612efb0bac15f875595 v: v3 --- [refs] | 2 +- trunk/sound/core/pcm_lib.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 283717dd55ed..b12a58b16e31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98204646f2b15d368701265e4194b773a6f94600 +refs/heads/master: 5f513e1197f27e9a0bcfec0feaac59f976f4a37e diff --git a/trunk/sound/core/pcm_lib.c b/trunk/sound/core/pcm_lib.c index 302654769faf..92ed6d819225 100644 --- a/trunk/sound/core/pcm_lib.c +++ b/trunk/sound/core/pcm_lib.c @@ -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; }