2 files changed, 3 insertions, 3 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 806f1fba5446..93d7ca502730 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -148,8 +148,6 @@ static inline snd_pcm_uframes_t snd_pcm_update_hw_ptr_pos(struct snd_pcm_substre
         pos = substream->ops->pointer(substream);
         if (pos == SNDRV_PCM_POS_XRUN)
                 return pos; /* XRUN */
-        if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
-                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);
@@ -189,6 +187,8 @@ static inline int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *subs
         snd_pcm_uframes_t new_hw_ptr, hw_ptr_interrupt;
         snd_pcm_sframes_t delta;
 
+        if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_MMAP)
+                getnstimeofday((struct timespec *)&runtime->status->tstamp);
         pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
         if (pos == SNDRV_PCM_POS_XRUN) {
                 xrun(substream);
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index fb3dde4db045..6245bdaffa68 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -595,7 +595,7 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
         status->trigger_tstamp = runtime->trigger_tstamp;
         if (snd_pcm_running(substream)) {
                 snd_pcm_update_hw_ptr(substream);
-                if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
+                if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_MMAP)
                         status->tstamp = runtime->status->tstamp;
                 else
                         getnstimeofday(&status->tstamp);