aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-video.c
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2005-11-09 00:36:35 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:10 -0500
commitbb881f142465a7a70bc9a364786e39aa4aaba4d2 (patch)
tree20774accd9d33e072946ab0cb802dd02dda84c5e /drivers/media/video/saa7134/saa7134-video.c
parentfd1c388125d713b403569d96d9845470142884a2 (diff)
[PATCH] v4l: 663: add new rtd cards
- Add new RTD cards 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/video/saa7134/saa7134-video.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 35e5e85f669a..d395403afe5a 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1666,6 +1666,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
1666 case VIDIOC_QUERYCAP: 1666 case VIDIOC_QUERYCAP:
1667 { 1667 {
1668 struct v4l2_capability *cap = arg; 1668 struct v4l2_capability *cap = arg;
1669 unsigned int tuner_type = dev->tuner_type;
1669 1670
1670 memset(cap,0,sizeof(*cap)); 1671 memset(cap,0,sizeof(*cap));
1671 strcpy(cap->driver, "saa7134"); 1672 strcpy(cap->driver, "saa7134");
@@ -1677,9 +1678,13 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
1677 V4L2_CAP_VIDEO_CAPTURE | 1678 V4L2_CAP_VIDEO_CAPTURE |
1678 V4L2_CAP_VIDEO_OVERLAY | 1679 V4L2_CAP_VIDEO_OVERLAY |
1679 V4L2_CAP_VBI_CAPTURE | 1680 V4L2_CAP_VBI_CAPTURE |
1680 V4L2_CAP_TUNER |
1681 V4L2_CAP_READWRITE | 1681 V4L2_CAP_READWRITE |
1682 V4L2_CAP_STREAMING; 1682 V4L2_CAP_STREAMING |
1683 V4L2_CAP_TUNER;
1684
1685 if ((tuner_type == TUNER_ABSENT) || (tuner_type == UNSET))
1686 cap->capabilities &= ~V4L2_CAP_TUNER;
1687
1683 return 0; 1688 return 0;
1684 } 1689 }
1685 1690