From 95ab4b60e6a647c2be22818a0631c2714ada0974 Mon Sep 17 00:00:00 2001 From: "Nickolay V. Shmyrev" Date: Tue, 18 Oct 2005 21:49:21 +0000 Subject: * ../linux/drivers/media/video/cx88/cx88-video.c: (radio_do_ioctl): * ../linux/drivers/media/video/saa7134/saa7134-video.c: (video_do_ioctl), (radio_do_ioctl): - Set tuner type in VIDIOC_G_TUNER. Signed-off-by: Elad Lahav --- linux/drivers/media/video/cx88/cx88-video.c | 3 ++- linux/drivers/media/video/saa7134/saa7134-video.c | 4 +++- v4l/ChangeLog | 10 ++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 2a7630ec5..0867b33a6 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.98 2005/10/17 21:18:42 mchehab Exp $ + * $Id: cx88-video.c,v 1.99 2005/10/18 21:49:21 nsh Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1795,6 +1795,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, memset(t,0,sizeof(*t)); strcpy(t->name, "Radio"); + t->type = V4L2_TUNER_RADIO; cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t); return 0; diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index bca77d02b..f16dd82ae 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-video.c,v 1.45 2005/10/17 21:18:42 mchehab Exp $ + * $Id: saa7134-video.c,v 1.46 2005/10/18 21:49:21 nsh Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -1873,6 +1873,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, break; if (NULL != card_in(dev,n).name) { strcpy(t->name, "Television"); + t->type = V4L2_TUNER_ANALOG_TV; t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LANG1 | @@ -2176,6 +2177,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, memset(t,0,sizeof(*t)); strcpy(t->name, "Radio"); + t->type = V4L2_TUNER_RADIO; saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ed1ca7349..1d9cab862 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-10-18 21:48 nshmyrev + + * ../linux/drivers/media/video/cx88/cx88-video.c: (radio_do_ioctl): + * ../linux/drivers/media/video/saa7134/saa7134-video.c: + (video_do_ioctl), (radio_do_ioctl): + + - Set tuner type in VIDIOC_G_TUNER. + + Signed-off-by: Elad Lahav + 2005-10-18 17:16 mchehab * ../linux/drivers/usb/media/em2820-cards.c: (em2820_card_setup): -- cgit v1.2.3