[REVIEW PATCH 02/12] em28xx: disable tuner related ioctls for video and VBI devices without tuner

[Frank Schäfer]

Disable the ioctls VIDIOC_G_TUNER, VIDIOC_S_TUNER, VIDIOC_G_FREQUENCY and
VIDIOC_S_FREQUENCY for video and VBI devices without tuner.

Signed-off-by: Frank Schäfer <fschaefer....@googlemail.com>
---
 drivers/media/usb/em28xx/em28xx-video.c |   14 ++++++++++++++
 1 Datei geändert, 14 Zeilen hinzugefügt(+)

diff --git a/drivers/media/usb/em28xx/em28xx-video.c 
b/drivers/media/usb/em28xx/em28xx-video.c
index 7f1f37c..dd2e31c 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1899,6 +1899,12 @@ int em28xx_register_analog_devices(struct em28xx *dev)
                v4l2_disable_ioctl(dev->vdev, VIDIOC_G_STD);
                v4l2_disable_ioctl(dev->vdev, VIDIOC_S_STD);
        }
+       if (dev->tuner_type == TUNER_ABSENT) {
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_G_TUNER);
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_S_TUNER);
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_G_FREQUENCY);
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_S_FREQUENCY);
+       }
 
        /* register v4l2 video video_device */
        ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
@@ -1917,6 +1923,14 @@ int em28xx_register_analog_devices(struct em28xx *dev)
                dev->vbi_dev->queue = &dev->vb_vbiq;
                dev->vbi_dev->queue->lock = &dev->vb_vbi_queue_lock;
 
+               /* disable inapplicable ioctls */
+               if (dev->tuner_type == TUNER_ABSENT) {
+                       v4l2_disable_ioctl(dev->vbi_dev, VIDIOC_G_TUNER);
+                       v4l2_disable_ioctl(dev->vbi_dev, VIDIOC_S_TUNER);
+                       v4l2_disable_ioctl(dev->vbi_dev, VIDIOC_G_FREQUENCY);
+                       v4l2_disable_ioctl(dev->vbi_dev, VIDIOC_S_FREQUENCY);
+               }
+
                /* register v4l2 vbi video_device */
                ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
                                            vbi_nr[dev->devno]);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html