diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 18:05:06 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-26 00:03:30 +0300 |
| commit | a9622391acbcdb124b55eb674dc5196eb55dc105 (patch) | |
| tree | df4d4c37e3ffb8aa7e99eec8aca77004fb28be0e /drivers | |
| parent | bfb12e38a8f828bb6394fd4f18010bad86832623 (diff) | |
| download | linux-a9622391acbcdb124b55eb674dc5196eb55dc105.tar.xz | |
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')
| -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, printk(KERN_INFO "%s: registered device video%d [v4l2]\n", dev->name,dev->video_dev->minor & 0x1f); - dev->vbi_dev = vdev_init(dev,&saa7134_vbi_template,"vbi"); + dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); + dev->vbi_dev->type = VID_TYPE_TUNER | VID_TYPE_TELETEXT; + err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, vbi_nr[dev->nr]); 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 = .current_norm = V4L2_STD_PAL, }; -struct video_device saa7134_vbi_template = -{ - .name = "saa7134-vbi", - .type = VID_TYPE_TUNER|VID_TYPE_TELETEXT, - .fops = &video_fops, - .minor = -1, -}; - struct video_device saa7134_radio_template = { .name = "saa7134-radio", |