aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-20 11:59:32 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:45 -0500
commit84f1b6783a8f7057f3d7a5388c5f3f4a8bce7b0b (patch)
treea73cd7c67de65ed8b91790a488b8ace969c57e6f
parent1571720c5ecfb9b5f27aff0678e3bef0cb1821ca (diff)
V4L/DVB (5107): Use cx88_set_freq() on cx88-blackbird.c
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 54380ddb12c5..e194949f8577 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -963,24 +963,7 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
963 BLACKBIRD_MPEG_CAPTURE, 963 BLACKBIRD_MPEG_CAPTURE,
964 BLACKBIRD_RAW_BITS_NONE); 964 BLACKBIRD_RAW_BITS_NONE);
965 965
966 if (UNSET == core->tuner_type) 966 cx88_set_freq (core,f);
967 return -EINVAL;
968 if (f->tuner != 0)
969 return -EINVAL;
970 if (0 == radio && f->type != V4L2_TUNER_ANALOG_TV)
971 return -EINVAL;
972 if (1 == radio && f->type != V4L2_TUNER_RADIO)
973 return -EINVAL;
974 mutex_lock(&core->lock);
975 core->freq = f->frequency;
976 cx88_newstation(core);
977 cx88_call_i2c_clients(core,VIDIOC_S_FREQUENCY,f);
978
979 /* When changing channels it is required to reset TVAUDIO */
980 msleep (10);
981 cx88_set_tvaudio(core);
982
983 mutex_unlock(&core->lock);
984 967
985 blackbird_initialize_codec(dev); 968 blackbird_initialize_codec(dev);
986 cx88_set_scale(dev->core, dev->width, dev->height, 969 cx88_set_scale(dev->core, dev->width, dev->height,