[media] em28xx: use v4l2_disable_ioctl() to disable ioctls VIDIOC_QUERYSTD, VIDIOC_G...

Instead of checking the device type and returning -ENOTTY inside the ioctl
functions, use v4l2_disable_ioctl() to disable the ioctls VIDIOC_QUERYSTD,
VIDIOC_G_STD and VIDIOC_S_STD if the device is a camera.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 32bd7de5dec1f55c24936b2476bfc8f8f10c6d92..d1e6ba62e06ccadb52ede07cf68ef5a381833426 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -959,8 +959,6 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm)
        struct em28xx      *dev = fh->dev;
        int                rc;
 
-       if (dev->board.is_webcam)
-               return -ENOTTY;
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
@@ -976,8 +974,6 @@ static int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *norm)
        struct em28xx      *dev = fh->dev;
        int                rc;
 
-       if (dev->board.is_webcam)
-               return -ENOTTY;
        rc = check_dev(dev);
        if (rc < 0)
                return rc;
@@ -994,8 +990,6 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)
        struct v4l2_format f;
        int                rc;
 
-       if (dev->board.is_webcam)
-               return -ENOTTY;
        if (*norm == dev->norm)
                return 0;
        rc = check_dev(dev);
@@ -1899,6 +1893,13 @@ int em28xx_register_analog_devices(struct em28xx *dev)
        dev->vdev->queue = &dev->vb_vidq;
        dev->vdev->queue->lock = &dev->vb_queue_lock;
 
+       /* disable inapplicable ioctls */
+       if (dev->board.is_webcam) {
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_QUERYSTD);
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_G_STD);
+               v4l2_disable_ioctl(dev->vdev, VIDIOC_S_STD);
+       }
+
        /* register v4l2 video video_device */
        ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
                                       video_nr[dev->devno]);