Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / sound / core / pcm_lib.c

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 0503980c23d91ca67ac04c93fc9ae86740cc42df..3dbf9bf2ac162ef49cb40f79805b99927384c7e9 100644 (file)
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -152,13 +152,12 @@ static inline snd_pcm_uframes_t snd_pcm_update_hw_ptr_pos(snd_pcm_substream_t *s
        if (pos == SNDRV_PCM_POS_XRUN)
                return pos; /* XRUN */
        if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
-               snd_timestamp_now((snd_timestamp_t*)&runtime->status->tstamp, runtime->tstamp_timespec);
+               getnstimeofday((struct timespec *)&runtime->status->tstamp);
 #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);
-       } else
+       }
 #endif
-       snd_runtime_check(pos < runtime->buffer_size, return 0);
        pos -= pos % runtime->min_align;
        return pos;
 }