diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 10:05:06 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:03:30 -0500 |
commit | a9622391acbcdb124b55eb674dc5196eb55dc105 (patch) | |
tree | df4d4c37e3ffb8aa7e99eec8aca77004fb28be0e /drivers/media | |
parent | bfb12e38a8f828bb6394fd4f18010bad86832623 (diff) |
V4L/DVB (6792): Fix VBI support
VBI were broken, since there weren't any function handlers for it. This patch
fixes it, by removing the vbi_template, using, instead video_template.
This also saves some space at the data segment.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 92c48ee1591b..52baa4f7f7dd 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -1053,7 +1053,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
1053 | printk(KERN_INFO "%s: registered device video%d [v4l2]\n", | 1053 | printk(KERN_INFO "%s: registered device video%d [v4l2]\n", |
1054 | dev->name,dev->video_dev->minor & 0x1f); | 1054 | dev->name,dev->video_dev->minor & 0x1f); |
1055 | 1055 | ||
1056 | dev->vbi_dev = vdev_init(dev,&saa7134_vbi_template,"vbi"); | 1056 | dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); |
1057 | dev->vbi_dev->type = VID_TYPE_TUNER | VID_TYPE_TELETEXT; | ||
1058 | |||
1057 | err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, | 1059 | err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, |
1058 | vbi_nr[dev->nr]); | 1060 | vbi_nr[dev->nr]); |
1059 | if (err < 0) | 1061 | if (err < 0) |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 6f9f9dbdfdd1..6a29b75beaa6 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -2406,14 +2406,6 @@ struct video_device saa7134_video_template = | |||
2406 | .current_norm = V4L2_STD_PAL, | 2406 | .current_norm = V4L2_STD_PAL, |
2407 | }; | 2407 | }; |
2408 | 2408 | ||
2409 | struct video_device saa7134_vbi_template = | ||
2410 | { | ||
2411 | .name = "saa7134-vbi", | ||
2412 | .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, | ||
2413 | .fops = &video_fops, | ||
2414 | .minor = -1, | ||
2415 | }; | ||
2416 | |||
2417 | struct video_device saa7134_radio_template = | 2409 | struct video_device saa7134_radio_template = |
2418 | { | 2410 | { |
2419 | .name = "saa7134-radio", | 2411 | .name = "saa7134-radio", |