[PATCH] em28xx: return -ENOTTY for tuner + frequency + VBI-format ioctls if the device is a webcam

[Frank Schäfer]

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 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

--
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