From 7ee59b5f13c8b9bd8addc0704ff040080e050f15 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 2 Oct 2010 10:59:15 -0300
Subject: [PATCH] --- yaml --- r: 219354 b: refs/heads/master c:
 92d0d66c1515c8ee3b700ab3d610587c71fe497f h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/dvb/ttpci/av7110_av.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 110e9fef3aea..38ccf360f55f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd1751b49be2860cc8c6a61e8fadda0caf22e5a
+refs/heads/master: 92d0d66c1515c8ee3b700ab3d610587c71fe497f
diff --git a/trunk/drivers/media/dvb/ttpci/av7110_av.c b/trunk/drivers/media/dvb/ttpci/av7110_av.c
index 13efba942dac..4a31cf674631 100644
--- a/trunk/drivers/media/dvb/ttpci/av7110_av.c
+++ b/trunk/drivers/media/dvb/ttpci/av7110_av.c
@@ -245,8 +245,11 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
 		return -1;
 	}
 	while (1) {
-		if ((len = dvb_ringbuffer_avail(buf)) < 6)
+		len = dvb_ringbuffer_avail(buf);
+		if (len < 6) {
+			wake_up(&buf->queue);
 			return -1;
+		}
 		sync =  DVB_RINGBUFFER_PEEK(buf, 0) << 24;
 		sync |= DVB_RINGBUFFER_PEEK(buf, 1) << 16;
 		sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8;