---

yaml --- r: 81588 b: refs/heads/master c: a713b58 h: refs/heads/master v: v3
git-mirror · Jan 31, 2008 · 5edb20b · 5edb20b
1 parent 5e7a9df
commit 5edb20b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0678accd2da33873455ef8d41d847bd550727159
+refs/heads/master: a713b5834731f32757b30de038dcb995afac2ad1
diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c
@@ -593,14 +593,9 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
 	if (status->state == SNDRV_PCM_STATE_OPEN)
 		goto _end;
 	status->trigger_tstamp = runtime->trigger_tstamp;
-	if (snd_pcm_running(substream)) {
+	if (snd_pcm_running(substream))
 		snd_pcm_update_hw_ptr(substream);
-		if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_MMAP)
-			status->tstamp = runtime->status->tstamp;
-		else
-			snd_pcm_gettime(runtime, &status->tstamp);
-	} else
-		snd_pcm_gettime(runtime, &status->tstamp);
+	snd_pcm_gettime(runtime, &status->tstamp);
 	status->appl_ptr = runtime->control->appl_ptr;
 	status->hw_ptr = runtime->status->hw_ptr;
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {