diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 8 | ||||
| -rw-r--r-- | v4l/ChangeLog | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 72f8a17ef..3ceb8cb96 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.65 2005/06/16 21:15:06 mchehab Exp $ + * $Id: cx88-video.c,v 1.66 2005/06/17 03:36:10 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1592,11 +1592,11 @@ static int video_do_ioctl(struct inode *inode, struct file *file, { struct v4l2_frequency *f = arg; + memset(f,0,sizeof(*f)); + if (UNSET == core->tuner_type) return -EINVAL; - if (f->tuner != 0) - return -EINVAL; - memset(f,0,sizeof(*f)); + f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; f->frequency = dev->freq; return 0; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 65689e4ca..7e31402d2 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-06-17 00:00 mchehab + * cx88-video.c: + + - Fixes a bug on VIDEO_G_FREQUENCY that avoids it to report + frequency. + 2005-06-17 00:00 nshmyrev * bttv-driver.c, bttvp.h: |