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: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

6 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 53a67824071b..a6cc12f8736c 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1591,7 +1591,7 @@ static int mpeg_open(struct file *file)
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct cx23885_buffer),
-                            fh);
+                            fh, NULL);
         unlock_kernel();
 
         return 0;
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index e76ce8709afd..db054004e462 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -1247,7 +1247,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
-                                "cx25840", "cx25840", 0x88 >> 1, NULL);
+                                NULL, "cx25840", 0x88 >> 1, NULL);
                 if (dev->sd_cx25840) {
                         dev->sd_cx25840->grp_id = CX23885_HW_AV_CORE;
                         v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index f6b62e7398af..359882419b7f 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -815,6 +815,7 @@ static void cx23885_dev_checkrevision(struct cx23885_dev *dev)
         case 0x0e:
                 /* CX23887-15Z */
                 dev->hwrevision = 0xc0;
+                break;
         case 0x0f:
                 /* CX23887-14Z */
                 dev->hwrevision = 0xb1;
@@ -1221,7 +1222,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
         struct videobuf_dmabuf *dma = videobuf_to_dma(&buf->vb);
 
         BUG_ON(in_interrupt());
-        videobuf_waiton(&buf->vb, 0, 0);
+        videobuf_waiton(q, &buf->vb, 0, 0);
         videobuf_dma_unmap(q->dev, dma);
         videobuf_dma_free(dma);
         btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 3d70af283881..5958cb882e93 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -1017,10 +1017,7 @@ static int dvb_register(struct cx23885_tsport *port)
                 /* Read entire EEPROM */
                 dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
                 tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom));
-                printk(KERN_INFO "TeVii S470 MAC= "
-                                "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                                eeprom[0xa0], eeprom[0xa1], eeprom[0xa2],
-                                eeprom[0xa3], eeprom[0xa4], eeprom[0xa5]);
+                printk(KERN_INFO "TeVii S470 MAC= %pM\n", eeprom + 0xa0);
                 memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
                 break;
                 }
@@ -1074,7 +1071,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
                 videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops,
                             &dev->pci->dev, &port->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,
-                            sizeof(struct cx23885_buffer), port);
+                            sizeof(struct cx23885_buffer), port, NULL);
         }
         err = dvb_register(port);
         if (err != 0)
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index da66e5f8d91d..93af9c65b484 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -758,7 +758,7 @@ static int video_open(struct file *file)
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct cx23885_buffer),
-                            fh);
+                            fh, NULL);
 
         dprintk(1, "post videobuf_queue_init()\n");
 
@@ -1165,9 +1165,10 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
         i->type  = V4L2_INPUT_TYPE_CAMERA;
         strcpy(i->name, iname[INPUT(n)->type]);
         if ((CX23885_VMUX_TELEVISION == INPUT(n)->type) ||
-                (CX23885_VMUX_CABLE == INPUT(n)->type))
+                (CX23885_VMUX_CABLE == INPUT(n)->type)) {
                 i->type = V4L2_INPUT_TYPE_TUNER;
                 i->std = CX23885_NORMS;
+        }
         return 0;
 }
 
@@ -1511,11 +1512,11 @@ int cx23885_video_register(struct cx23885_dev *dev)
                 if (dev->tuner_addr)
                         sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[1].i2c_adap,
-                                "tuner", "tuner", dev->tuner_addr, NULL);
+                                NULL, "tuner", dev->tuner_addr, NULL);
                 else
                         sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
-                                &dev->i2c_bus[1].i2c_adap,
-                                "tuner", "tuner", 0, v4l2_i2c_tuner_addrs(ADDRS_TV));
+                                &dev->i2c_bus[1].i2c_adap, NULL,
+                                "tuner", 0, v4l2_i2c_tuner_addrs(ADDRS_TV));
                 if (sd) {
                         struct tuner_setup tun_setup;
 
diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c
index 2502a0a67097..e78e3e4c8112 100644
--- a/drivers/media/video/cx23885/cx23888-ir.c
+++ b/drivers/media/video/cx23885/cx23888-ir.c
@@ -704,6 +704,7 @@ static int cx23888_ir_rx_read(struct v4l2_subdev *sd, u8 *buf, size_t count,
                 if (v > IR_MAX_DURATION)
                         v = IR_MAX_DURATION;
 
+                init_ir_raw_event(&p->ir_core_data);
                 p->ir_core_data.pulse = u;
                 p->ir_core_data.duration = v;