* [PATCH] em28xx: return -ENOTTY for tuner + frequency + VBI-format ioctls if the device is a webcam
@ 2013-01-12 17:51 Frank Schäfer
2013-01-12 18:10 ` Frank Schäfer
0 siblings, 1 reply; 2+ messages in thread
From: Frank Schäfer @ 2013-01-12 17:51 UTC (permalink / raw)
To: mchehab; +Cc: linux-media, hans.verkuil, Frank Schäfer
Signed-off-by: Frank Schäfer <fschaefer.oss@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 2eabf2a..1d1ef68 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1204,6 +1204,8 @@ static int vidioc_g_tuner(struct file *file, void *priv,
struct em28xx *dev = fh->dev;
int rc;
+ if (dev->board.is_webcam)
+ return -ENOTTY;
rc = check_dev(dev);
if (rc < 0)
return rc;
@@ -1224,6 +1226,8 @@ static int vidioc_s_tuner(struct file *file, void *priv,
struct em28xx *dev = fh->dev;
int rc;
+ if (dev->board.is_webcam)
+ return -ENOTTY;
rc = check_dev(dev);
if (rc < 0)
return rc;
@@ -1241,6 +1245,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
struct em28xx_fh *fh = priv;
struct em28xx *dev = fh->dev;
+ if (dev->board.is_webcam)
+ return -ENOTTY;
if (0 != f->tuner)
return -EINVAL;
@@ -1255,6 +1261,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
struct em28xx *dev = fh->dev;
int rc;
+ if (dev->board.is_webcam)
+ return -ENOTTY;
rc = check_dev(dev);
if (rc < 0)
return rc;
@@ -1499,6 +1507,9 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
struct em28xx_fh *fh = priv;
struct em28xx *dev = fh->dev;
+ if (dev->board.is_webcam)
+ return -ENOTTY;
+
format->fmt.vbi.samples_per_line = dev->vbi_width;
format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
format->fmt.vbi.offset = 0;
@@ -1528,6 +1539,9 @@ static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv,
struct em28xx_fh *fh = priv;
struct em28xx *dev = fh->dev;
+ if (dev->board.is_webcam)
+ return -ENOTTY;
+
format->fmt.vbi.samples_per_line = dev->vbi_width;
format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
format->fmt.vbi.offset = 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] em28xx: return -ENOTTY for tuner + frequency + VBI-format ioctls if the device is a webcam
2013-01-12 17:51 [PATCH] em28xx: return -ENOTTY for tuner + frequency + VBI-format ioctls if the device is a webcam Frank Schäfer
@ 2013-01-12 18:10 ` Frank Schäfer
0 siblings, 0 replies; 2+ messages in thread
From: Frank Schäfer @ 2013-01-12 18:10 UTC (permalink / raw)
To: Frank Schäfer; +Cc: mchehab, linux-media, hans.verkuil
Am 12.01.2013 18:51, schrieb Frank Schäfer:
> Signed-off-by: Frank Schäfer <fschaefer.oss@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 2eabf2a..1d1ef68 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -1204,6 +1204,8 @@ static int vidioc_g_tuner(struct file *file, void *priv,
> struct em28xx *dev = fh->dev;
> int rc;
>
> + if (dev->board.is_webcam)
> + return -ENOTTY;
> rc = check_dev(dev);
> if (rc < 0)
> return rc;
> @@ -1224,6 +1226,8 @@ static int vidioc_s_tuner(struct file *file, void *priv,
> struct em28xx *dev = fh->dev;
> int rc;
>
> + if (dev->board.is_webcam)
> + return -ENOTTY;
> rc = check_dev(dev);
> if (rc < 0)
> return rc;
> @@ -1241,6 +1245,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
> struct em28xx_fh *fh = priv;
> struct em28xx *dev = fh->dev;
>
> + if (dev->board.is_webcam)
> + return -ENOTTY;
> if (0 != f->tuner)
> return -EINVAL;
>
> @@ -1255,6 +1261,8 @@ static int vidioc_s_frequency(struct file *file, void *priv,
> struct em28xx *dev = fh->dev;
> int rc;
>
> + if (dev->board.is_webcam)
> + return -ENOTTY;
> rc = check_dev(dev);
> if (rc < 0)
> return rc;
> @@ -1499,6 +1507,9 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
> struct em28xx_fh *fh = priv;
> struct em28xx *dev = fh->dev;
>
> + if (dev->board.is_webcam)
> + return -ENOTTY;
> +
> format->fmt.vbi.samples_per_line = dev->vbi_width;
> format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
> format->fmt.vbi.offset = 0;
> @@ -1528,6 +1539,9 @@ static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv,
> struct em28xx_fh *fh = priv;
> struct em28xx *dev = fh->dev;
>
> + if (dev->board.is_webcam)
> + return -ENOTTY;
> +
> format->fmt.vbi.samples_per_line = dev->vbi_width;
> format->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
> format->fmt.vbi.offset = 0;
Please disregard this patch, I will send a better one tomorrow.
Regards,
Frank
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-12 18:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-12 17:51 [PATCH] em28xx: return -ENOTTY for tuner + frequency + VBI-format ioctls if the device is a webcam Frank Schäfer
2013-01-12 18:10 ` Frank Schäfer
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.