---

yaml --- r: 2643 b: refs/heads/master c: fb4bd0a h: refs/heads/master i: 2641: 0310261 2639: 6ca2606 v: v3
git-mirror · Jun 22, 2005 · f1803db · f1803db
1 parent 72d2cac
commit f1803db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21cb2a2ec5818cbba01bcb7f24388670322c77f9
+refs/heads/master: fb4bd0adc4b5b6538933b098a67851d8f99b5ca3
diff --git a/trunk/sound/core/oss/pcm_oss.c b/trunk/sound/core/oss/pcm_oss.c
@@ -1539,10 +1539,13 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str
 	} else {
 		delay = snd_pcm_oss_bytes(substream, delay) + fixup;
 		info.blocks = delay / runtime->oss.period_bytes;
-		if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+		if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+			if (runtime->oss.bytes == 0)
+				delay = 0;
 			info.bytes = (runtime->oss.bytes - delay) & INT_MAX;
-		else
+		} else {
 			info.bytes = (runtime->oss.bytes + delay) & INT_MAX;
+		}
 	}
 	if (copy_to_user(_info, &info, sizeof(info)))
 		return -EFAULT;