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>
This commit is contained in:
Mauro Carvalho Chehab 2007-12-11 12:05:06 -03:00
parent bfb12e38a8
commit a9622391ac
2 changed files with 3 additions and 9 deletions

View File

@ -1053,7 +1053,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
printk(KERN_INFO "%s: registered device video%d [v4l2]\n", printk(KERN_INFO "%s: registered device video%d [v4l2]\n",
dev->name,dev->video_dev->minor & 0x1f); 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, err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
vbi_nr[dev->nr]); vbi_nr[dev->nr]);
if (err < 0) if (err < 0)

View File

@ -2406,14 +2406,6 @@ struct video_device saa7134_video_template =
.current_norm = V4L2_STD_PAL, .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 = struct video_device saa7134_radio_template =
{ {
.name = "saa7134-radio", .name = "saa7134-radio",