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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h

1 files changed, 42 insertions, 5 deletions

diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index 402ce43ef38e..12a1b3d7132d 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -660,7 +660,7 @@ static void vpfe_detach_irq(struct vpfe_device *vpfe_dev)
 
         frame_format = ccdc_dev->hw_ops.get_frame_format();
         if (frame_format == CCDC_FRMFMT_PROGRESSIVE)
-                free_irq(IRQ_VDINT1, vpfe_dev);
+                free_irq(vpfe_dev->ccdc_irq1, vpfe_dev);
 }
 
 static int vpfe_attach_irq(struct vpfe_device *vpfe_dev)
@@ -1338,7 +1338,7 @@ static int vpfe_reqbufs(struct file *file, void *priv,
         vpfe_dev->memory = req_buf->memory;
         videobuf_queue_dma_contig_init(&vpfe_dev->buffer_queue,
                                 &vpfe_videobuf_qops,
-                                NULL,
+                                vpfe_dev->pdev,
                                 &vpfe_dev->irqlock,
                                 req_buf->type,
                                 vpfe_dev->fmt.fmt.pix.field,
@@ -1413,6 +1413,41 @@ static int vpfe_dqbuf(struct file *file, void *priv,
                                       buf, file->f_flags & O_NONBLOCK);
 }
 
+static int vpfe_queryctrl(struct file *file, void *priv,
+                struct v4l2_queryctrl *qctrl)
+{
+        struct vpfe_device *vpfe_dev = video_drvdata(file);
+        struct vpfe_subdev_info *sdinfo;
+
+        sdinfo = vpfe_dev->current_subdev;
+
+        return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                         core, queryctrl, qctrl);
+
+}
+
+static int vpfe_g_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl)
+{
+        struct vpfe_device *vpfe_dev = video_drvdata(file);
+        struct vpfe_subdev_info *sdinfo;
+
+        sdinfo = vpfe_dev->current_subdev;
+
+        return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                         core, g_ctrl, ctrl);
+}
+
+static int vpfe_s_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl)
+{
+        struct vpfe_device *vpfe_dev = video_drvdata(file);
+        struct vpfe_subdev_info *sdinfo;
+
+        sdinfo = vpfe_dev->current_subdev;
+
+        return v4l2_device_call_until_err(&vpfe_dev->v4l2_dev, sdinfo->grp_id,
+                                         core, s_ctrl, ctrl);
+}
+
 /*
  * vpfe_calculate_offsets : This function calculates buffers offset
  * for top and bottom field
@@ -1577,7 +1612,7 @@ static int vpfe_cropcap(struct file *file, void *priv,
 
         v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_cropcap\n");
 
-        if (vpfe_dev->std_index > ARRAY_SIZE(vpfe_standards))
+        if (vpfe_dev->std_index >= ARRAY_SIZE(vpfe_standards))
                 return -EINVAL;
 
         memset(crop, 0, sizeof(struct v4l2_cropcap));
@@ -1710,6 +1745,9 @@ static const struct v4l2_ioctl_ops vpfe_ioctl_ops = {
         .vidioc_querystd         = vpfe_querystd,
         .vidioc_s_std            = vpfe_s_std,
         .vidioc_g_std            = vpfe_g_std,
+        .vidioc_queryctrl        = vpfe_queryctrl,
+        .vidioc_g_ctrl           = vpfe_g_ctrl,
+        .vidioc_s_ctrl           = vpfe_s_ctrl,
         .vidioc_reqbufs          = vpfe_reqbufs,
         .vidioc_querybuf         = vpfe_querybuf,
         .vidioc_qbuf             = vpfe_qbuf,
@@ -1978,8 +2016,7 @@ static __init int vpfe_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, vpfe_dev);
         /* set driver private data */
         video_set_drvdata(vpfe_dev->video_dev, vpfe_dev);
-        i2c_adap = i2c_get_adapter(1);
-        vpfe_cfg = pdev->dev.platform_data;
+        i2c_adap = i2c_get_adapter(vpfe_cfg->i2c_adapter_id);
         num_subdevs = vpfe_cfg->num_subdevs;
         vpfe_dev->sd = kmalloc(sizeof(struct v4l2_subdev *) * num_subdevs,
                                 GFP_KERNEL);