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

Pull media updates from Mauro Carvalho Chehab:
 - removal of sn9c102.  This device driver was replaced a long time ago
   by gspca
 - solo6x10 and go7007 webcam drivers moved from staging into
   mainstream.  They were waiting for an API to allow setting the image
   detection matrix
 - SDR drivers moved from staging into mainstream: sdr-msi3101 (renamed
   as msi2500) and rtl2832
 - added SDR driver for airspy
 - added demux driver: si2165
 - rework at several RC subsystem, making the code for RC-5 SZ variant
   to be added at the standard RC5 decoder
 - added decoder for the XMP IR protocol
 - tuner driver moved from staging into mainstream: msi3101 (renamed as
   msi001)
 - added documentation for some additional SDR pixfmt
 - some device tree bindings documented
 - added support for exynos3250 at s5p-jpeg
 - remove the obsolete, unmaintained and broken mx1_camera driver
 - added support for remote controllers at au0828 driver
 - added a RC driver: sunxi-cir
 - several driver fixes, enhancements and cleanups.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (455 commits)
  [media] cx23885: fix UNSET/TUNER_ABSENT confusion
  [media] coda: fix build error by making reset control optional
  [media] radio-miropcm20: fix sparse NULL pointer warning
  [media] MAINTAINERS: Update go7007 pattern
  [media] MAINTAINERS: Update solo6x10 patterns
  [media] media: atmel-isi: add primary DT support
  [media] media: atmel-isi: convert the pdata from pointer to structure
  [media] media: atmel-isi: add v4l2 async probe support
  [media] rcar_vin: add devicetree support
  [media] media: pxa_camera device-tree support
  [media] media: mt9m111: add device-tree suppport
  [media] soc_camera: add support for dt binding soc_camera drivers
  [media] media: soc_camera: pxa_camera documentation device-tree support
  [media] media: mt9m111: add device-tree documentation
  [media] s5p-mfc: remove unnecessary calling to function video_devdata()
  [media] s5p-jpeg: add chroma subsampling adjustment for Exynos3250
  [media] s5p-jpeg: Prevent erroneous downscaling for Exynos3250 SoC
  [media] s5p-jpeg: Assure proper crop rectangle initialization
  [media] s5p-jpeg: fix g_selection op
  [media] s5p-jpeg: Adjust jpeg_bound_align_image to Exynos3250 needs
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 634d863c05b4..33617c365acc 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -335,7 +335,7 @@ static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll)
                 return DEFAULT_POLLMASK;
         if (video_is_registered(vdev))
                 res = vdev->fops->poll(filp, poll);
-        if (vdev->debug)
+        if (vdev->debug > 2)
                 printk(KERN_DEBUG "%s: poll: %08x\n",
                         video_device_node_name(vdev), res);
         return res;
@@ -563,20 +563,18 @@ static void determine_valid_ioctls(struct video_device *vdev)
         /* vfl_type and vfl_dir independent ioctls */
 
         SET_VALID_IOCTL(ops, VIDIOC_QUERYCAP, vidioc_querycap);
-        if (ops->vidioc_g_priority ||
-                        test_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags))
+        if (ops->vidioc_g_priority)
                 set_bit(_IOC_NR(VIDIOC_G_PRIORITY), valid_ioctls);
-        if (ops->vidioc_s_priority ||
-                        test_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags))
+        if (ops->vidioc_s_priority)
                 set_bit(_IOC_NR(VIDIOC_S_PRIORITY), valid_ioctls);
-        SET_VALID_IOCTL(ops, VIDIOC_STREAMON, vidioc_streamon);
-        SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff);
         /* Note: the control handler can also be passed through the filehandle,
            and that can't be tested here. If the bit for these control ioctls
            is set, then the ioctl is valid. But if it is 0, then it can still
            be valid if the filehandle passed the control handler. */
         if (vdev->ctrl_handler || ops->vidioc_queryctrl)
                 set_bit(_IOC_NR(VIDIOC_QUERYCTRL), valid_ioctls);
+        if (vdev->ctrl_handler || ops->vidioc_query_ext_ctrl)
+                set_bit(_IOC_NR(VIDIOC_QUERY_EXT_CTRL), valid_ioctls);
         if (vdev->ctrl_handler || ops->vidioc_g_ctrl || ops->vidioc_g_ext_ctrls)
                 set_bit(_IOC_NR(VIDIOC_G_CTRL), valid_ioctls);
         if (vdev->ctrl_handler || ops->vidioc_s_ctrl || ops->vidioc_s_ext_ctrls)
@@ -684,6 +682,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
                 SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);
                 SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
                 SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
+                SET_VALID_IOCTL(ops, VIDIOC_STREAMON, vidioc_streamon);
+                SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff);
         }
 
         if (is_vid || is_vbi) {