From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: mchehab@redhat.com
Cc: linux-media@vger.kernel.org, hans.verkuil@cisco.com,
"Frank Schäfer" <fschaefer.oss@googlemail.com>
Subject: [PATCH] em28xx: return -ENOTTY for tuner + frequency ioctls if the device has no tuner
Date: Sun, 13 Jan 2013 13:50:50 +0100 [thread overview]
Message-ID: <1358081450-5705-1-git-send-email-fschaefer.oss@googlemail.com> (raw)
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-video.c | 8 ++++++++
1 Datei geändert, 8 Zeilen hinzugefügt(+)
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 2eabf2a..4a7f73c 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->tuner_type == TUNER_ABSENT)
+ 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->tuner_type == TUNER_ABSENT)
+ 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->tuner_type == TUNER_ABSENT)
+ 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->tuner_type == TUNER_ABSENT)
+ return -ENOTTY;
rc = check_dev(dev);
if (rc < 0)
return rc;
--
1.7.10.4
next reply other threads:[~2013-01-13 12:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-13 12:50 Frank Schäfer [this message]
2013-01-14 9:20 ` [PATCH] em28xx: return -ENOTTY for tuner + frequency ioctls if the device has no tuner Hans Verkuil
2013-01-15 17:06 ` Frank Schäfer
2013-01-16 8:31 ` Hans Verkuil
2013-01-18 17:14 ` Frank Schäfer
2013-01-18 19:01 ` Hans Verkuil
2013-01-19 19:14 ` Frank Schäfer
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=1358081450-5705-1-git-send-email-fschaefer.oss@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=hans.verkuil@cisco.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox