Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 13efba942dac..952b33dbac4f 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -25,7 +25,7 @@
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  *
  *
- * the project's page is at http://www.linuxtv.org/dvb/
+ * the project's page is at http://www.linuxtv.org/ 
  */
 
 #include <linux/types.h>
@@ -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;
@@ -1521,6 +1524,7 @@ static const struct file_operations dvb_video_fops = {
         .open           = dvb_video_open,
         .release        = dvb_video_release,
         .poll           = dvb_video_poll,
+        .llseek         = noop_llseek,
 };
 
 static struct dvb_device dvbdev_video = {
@@ -1539,6 +1543,7 @@ static const struct file_operations dvb_audio_fops = {
         .open           = dvb_audio_open,
         .release        = dvb_audio_release,
         .poll           = dvb_audio_poll,
+        .llseek         = noop_llseek,
 };
 
 static struct dvb_device dvbdev_audio = {