LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Robert Fitzsimons <robfitz@273k.net>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Bongani Hlope <bonganilinux@mweb.co.za>,
	video4linux-list@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH] bttv: Re-enable radio tuner support for VIDIOCGFREQ/VIDIOCSFREQ ioctls.
Date: Wed, 27 Feb 2008 01:44:27 +0000	[thread overview]
Message-ID: <20080227014427.GB2685@localhost> (raw)
In-Reply-To: <20080227014238.GA2685@localhost>

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
---
 drivers/media/video/bt8xx/bttv-driver.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5404fcc..817a961 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1990,7 +1990,7 @@ static int bttv_g_frequency(struct file *file, void *priv,
 	if (0 != err)
 		return err;
 
-	f->type = V4L2_TUNER_ANALOG_TV;
+	f->type = btv->radio_user ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
 	f->frequency = btv->freq;
 
 	return 0;
@@ -2009,7 +2009,8 @@ static int bttv_s_frequency(struct file *file, void *priv,
 
 	if (unlikely(f->tuner != 0))
 		return -EINVAL;
-	if (unlikely(f->type != V4L2_TUNER_ANALOG_TV))
+	if (unlikely(f->type != (btv->radio_user
+		? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV)))
 		return -EINVAL;
 	mutex_lock(&btv->lock);
 	btv->freq = f->frequency;
-- 
1.5.4.34.g053d9


  reply	other threads:[~2008-02-27  1:44 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-17  8:36 2.6.25-rc[12] Video4Linux Bttv Regression Bongani Hlope
2008-02-18 16:11 ` Mauro Carvalho Chehab
2008-02-18 21:20   ` Bongani Hlope
2008-02-18 23:21     ` Bongani Hlope
2008-02-19 14:16       ` Mauro Carvalho Chehab
2008-02-19 20:37         ` Bongani Hlope
2008-02-21  9:03           ` Bongani Hlope
2008-02-26 15:41         ` Robert Fitzsimons
2008-02-27  1:42           ` Robert Fitzsimons
2008-02-27  1:44             ` Robert Fitzsimons [this message]
2008-02-27  1:47             ` [PATCH] bttv: Re-enabling radio support requires the use of struct bttv_fh Robert Fitzsimons
2008-02-27  9:52               ` Mauro Carvalho Chehab
2008-02-27 21:45               ` Bongani Hlope
2008-02-28  9:25                 ` Robert Fitzsimons
2008-03-17 21:51             ` 2.6.25-rc[12] Video4Linux Bttv Regression Bongani Hlope
2008-03-20 17:22               ` Mauro Carvalho Chehab
2008-03-21 14:55                 ` Bongani Hlope
2008-03-22  0:05                   ` [PATCH] bttv: Add a radio compat_ioctl file operation Robert Fitzsimons
2008-03-22 18:17                     ` Bongani Hlope
2008-03-23  1:01                       ` Mauro Carvalho Chehab
2008-03-23 13:25                         ` Bongani Hlope
2008-03-23 13:50                           ` Mauro Carvalho Chehab
2008-03-24  6:58                             ` Bongani Hlope

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=20080227014427.GB2685@localhost \
    --to=robfitz@273k.net \
    --cc=bonganilinux@mweb.co.za \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=video4linux-list@redhat.com \
    --subject='Re: [PATCH] bttv: Re-enable radio tuner support for VIDIOCGFREQ/VIDIOCSFREQ ioctls.' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).