Commit a9622391 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent bfb12e38

drivers/media/video/saa7134/saa7134-core.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

drivers/media/video/saa7134/saa7134-video.c

+0 −8
Original line number Diff line number Diff line
@@ -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",