From d38c854b22f5a69b77db57fe10fce848c8965252 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 11 Dec 2007 12:05:06 -0300 Subject: [PATCH] --- yaml --- r: 76569 b: refs/heads/master c: a9622391acbcdb124b55eb674dc5196eb55dc105 h: refs/heads/master i: 76567: ce136b5ae64361301c5f14816d3da3e0928b3ca2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-core.c | 4 +++- trunk/drivers/media/video/saa7134/saa7134-video.c | 8 -------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4a03365d2f86..14c165ec4203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfb12e38a8f828bb6394fd4f18010bad86832623 +refs/heads/master: a9622391acbcdb124b55eb674dc5196eb55dc105 diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c index 92c48ee1591b..52baa4f7f7dd 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-core.c +++ b/trunk/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/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c index 6f9f9dbdfdd1..6a29b75beaa6 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-video.c +++ b/trunk/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",