From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: mchehab@redhat.com
Cc: linux-media@vger.kernel.org,
"Frank Schäfer" <fschaefer.oss@googlemail.com>
Subject: [REVIEW PATCH 01/12] em28xx: use v4l2_disable_ioctl() to disable ioctls VIDIOC_QUERYSTD, VIDIOC_G/S_STD
Date: Fri, 25 Jan 2013 18:26:51 +0100 [thread overview]
Message-ID: <1359134822-4585-2-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1359134822-4585-1-git-send-email-fschaefer.oss@googlemail.com>
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>
---
drivers/media/usb/em28xx/em28xx-video.c | 13 +++++++------
1 Datei geändert, 7 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 2eabf2a..7f1f37c 100644
--- 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]);
--
1.7.10.4
next prev parent reply other threads:[~2013-01-25 17:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 17:26 [REVIEW PATCH 00/12] em28xx: ioctl fixes/clean-ups Frank Schäfer
2013-01-25 17:26 ` Frank Schäfer [this message]
2013-01-25 17:26 ` [REVIEW PATCH 02/12] em28xx: disable tuner related ioctls for video and VBI devices without tuner Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 03/12] em28xx: use v4l2_disable_ioctl() to disable ioctls VIDIOC_G_AUDIO and VIDIOC_S_AUDIO Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 04/12] em28xx: use v4l2_disable_ioctl() to disable ioctl VIDIOC_S_PARM Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 05/12] em28xx: disable ioctl VIDIOC_S_PARM for VBI devices Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 06/12] em28xx: make ioctls VIDIOC_G/S_PARM working " Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 07/12] em28xx: remove ioctl VIDIOC_CROPCAP Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 08/12] em28xx: get rid of duplicate function vidioc_s_fmt_vbi_cap() Frank Schäfer
2013-01-25 17:26 ` [REVIEW PATCH 09/12] em28xx: VIDIOC_G_TUNER: remove unneeded setting of tuner type Frank Schäfer
2013-01-25 17:27 ` [REVIEW PATCH 10/12] em28xx: remove obsolete device state checks from the ioctl functions Frank Schäfer
2013-01-25 17:27 ` [REVIEW PATCH 11/12] em28xx: make ioctl VIDIOC_DBG_G_CHIP_IDENT available for radio devices Frank Schäfer
2013-01-28 10:00 ` Hans Verkuil
2013-01-29 17:38 ` Frank Schäfer
2013-01-25 17:27 ` [REVIEW PATCH 12/12] em28xx: do not claim VBI support if the device is a camera Frank Schäfer
2013-01-28 10:01 ` [REVIEW PATCH 00/12] em28xx: ioctl fixes/clean-ups Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359134822-4585-2-git-send-email-fschaefer.oss@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.