1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index a7f54b010a5c..38f052257f46 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -722,8 +722,8 @@ unsigned int ivtv_v4l2_dec_poll(struct file *filp, poll_table *wait)
 
         /* If there are subscribed events, then only use the new event
            API instead of the old video.h based API. */
-        if (!list_empty(&id->fh.events->subscribed)) {
-                poll_wait(filp, &id->fh.events->wait, wait);
+        if (!list_empty(&id->fh.subscribed)) {
+                poll_wait(filp, &id->fh.wait, wait);
                 /* Turn off the old-style vsync events */
                 clear_bit(IVTV_F_I_EV_VSYNC_ENABLED, &itv->i_flags);
                 if (v4l2_event_pending(&id->fh))
@@ -750,6 +750,7 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait)
         struct ivtv *itv = id->itv;
         struct ivtv_stream *s = &itv->streams[id->type];
         int eof = test_bit(IVTV_F_S_STREAMOFF, &s->s_flags);
+        unsigned res = 0;
 
         /* Start a capture if there is none */
         if (!eof && !test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {
@@ -769,12 +770,16 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait)
         /* add stream's waitq to the poll list */
         IVTV_DEBUG_HI_FILE("Encoder poll\n");
         poll_wait(filp, &s->waitq, wait);
+        if (v4l2_event_pending(&id->fh))
+                res |= POLLPRI;
+        else
+                poll_wait(filp, &id->fh.wait, wait);
 
         if (s->q_full.length || s->q_io.length)
-                return POLLIN | POLLRDNORM;
+                return res | POLLIN | POLLRDNORM;
         if (eof)
-                return POLLHUP;
-        return 0;
+                return res | POLLHUP;
+        return res;
 }
 
 void ivtv_stop_capture(struct ivtv_open_id *id, int gop_end)
@@ -961,10 +966,6 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
                 return -ENOMEM;
         }
         v4l2_fh_init(&item->fh, s->vdev);
-        if (s->type == IVTV_DEC_STREAM_TYPE_YUV ||
-            s->type == IVTV_DEC_STREAM_TYPE_MPG) {
-                res = v4l2_event_alloc(&item->fh, 60);
-        }
         if (res < 0) {
                 v4l2_fh_exit(&item->fh);
                 kfree(item);