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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)

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);