diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 13:05:06 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 13:05:06 -0200 |
| commit | 325dc1c490d3ecf88a84a6885ef52659e4194a47 (patch) | |
| tree | d183e42c62796076c7b2aa926d1df509d75b7ad9 | |
| parent | 2335cf94d05216050921a32a567e26430759ca51 (diff) | |
| download | mediapointer-dvb-s2-325dc1c490d3ecf88a84a6885ef52659e4194a47.tar.gz mediapointer-dvb-s2-325dc1c490d3ecf88a84a6885ef52659e4194a47.tar.bz2 | |
Fix VBI support
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 extra BSS data.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 74b881864..002422380 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1149,7 +1149,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/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 0b2f5e71d..745a3382d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -2417,14 +2417,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", |