From: Andre Noll <maan@systemlinux.org>
Date: Wed, 13 Jan 2010 03:58:19 +0000 (+0100)
Subject: alsa: Increase timeout on eof to 20ms.
X-Git-Tag: v0.4.2~122
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=521b4c6c61dcea82dd749de8728d702008e0dea3;p=paraslash.git

alsa: Increase timeout on eof to 20ms.
---

diff --git a/alsa_write.c b/alsa_write.c
index 8e3688fa..27a8db3d 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -177,8 +177,8 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 		if (ret == 0)
 			return 1;
 		if (ret < 0) {
-			underrun = 10;
-			goto timeout;
+			sched_request_timeout_ms(20, s);
+			return 42;
 		}
 	} else {
 		if (*wng->loaded - wn->written < pad->bytes_per_frame)
@@ -202,7 +202,6 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 	if (underrun < 50)
 		underrun = 50;
 	underrun -= 50;
-timeout:
 	ms2tv(underrun, &tv);
 	if (tv_diff(&s->timeout, &tv, NULL) > 0)
 		s->timeout = tv;