Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / media / dvb / ttpci / av7110_av.c

diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 244d5d5..952b33d 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/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;