diff options
| author | Robert Fitzsimons | 2008-04-01 16:41:54 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-04-02 00:35:44 +0200 |
| commit | 1b0690134ec5dafb523a951a8756bb8735382fec (patch) | |
| tree | 48180a18fdf279c858d6a6b690cf88706a185c96 /drivers/media/video/bt8xx/bttv-driver.c | |
| parent | V4L/DVB (7277): bttv: Re-enabling radio support requires the use of struct bt... (diff) | |
| download | kernel-qcow2-linux-1b0690134ec5dafb523a951a8756bb8735382fec.tar.gz kernel-qcow2-linux-1b0690134ec5dafb523a951a8756bb8735382fec.tar.xz kernel-qcow2-linux-1b0690134ec5dafb523a951a8756bb8735382fec.zip | |
V4L/DVB (7278): bttv: Re-enable radio tuner support for VIDIOCGFREQ/VIDIOCSFREQ ioctls
Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
| -rw-r--r-- | 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 fc3f57adb729..ee826fd1b2ca 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; |