aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorElad Lahav <elad_lahav@users.sourceforge.net>2005-11-09 00:37:59 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:22 -0500
commit48c425965ecbd3472133adb857c2fe0608c053a0 (patch)
tree98c49ac78b146f9016e6132f3b15934cc9864239 /drivers/media
parentf59ab27b7a6fd760268f695078c739f3036b4edf (diff)
[PATCH] v4l: 821: set tuner type in vidioc_g_tuner
- Set tuner type in VIDIOC_G_TUNER. Signed-off-by: Elad Lahav <elad_lahav@users.sourceforge.net> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-video.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index cedd1d79ac13..24a48f8a48c1 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1506,6 +1506,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
1506 1506
1507 memset(t,0,sizeof(*t)); 1507 memset(t,0,sizeof(*t));
1508 strcpy(t->name, "Radio"); 1508 strcpy(t->name, "Radio");
1509 t->type = V4L2_TUNER_RADIO;
1509 1510
1510 cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t); 1511 cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t);
1511 return 0; 1512 return 0;
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 632ebe8724ec..45c852df13ed 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1862,6 +1862,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
1862 break; 1862 break;
1863 if (NULL != card_in(dev,n).name) { 1863 if (NULL != card_in(dev,n).name) {
1864 strcpy(t->name, "Television"); 1864 strcpy(t->name, "Television");
1865 t->type = V4L2_TUNER_ANALOG_TV;
1865 t->capability = V4L2_TUNER_CAP_NORM | 1866 t->capability = V4L2_TUNER_CAP_NORM |
1866 V4L2_TUNER_CAP_STEREO | 1867 V4L2_TUNER_CAP_STEREO |
1867 V4L2_TUNER_CAP_LANG1 | 1868 V4L2_TUNER_CAP_LANG1 |
@@ -2165,6 +2166,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
2165 2166
2166 memset(t,0,sizeof(*t)); 2167 memset(t,0,sizeof(*t));
2167 strcpy(t->name, "Radio"); 2168 strcpy(t->name, "Radio");
2169 t->type = V4L2_TUNER_RADIO;
2168 2170
2169 saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t); 2171 saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
2170 2172