Commit 6e46daba authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d34c353c

drivers/media/usb/em28xx/em28xx-video.c

+7 −6
Original line number Diff line number Diff line
@@ -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]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE