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