Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a9622391acbcdb124b55eb674dc5196eb55dc105
Commit:     a9622391acbcdb124b55eb674dc5196eb55dc105
Parent:     bfb12e38a8f828bb6394fd4f18010bad86832623
Author:     Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 11 12:05:06 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:03:30 2008 -0200

    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 <[EMAIL PROTECTED]>
---
 drivers/media/video/saa7134/saa7134-core.c  |    4 +++-
 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 92c48ee..52baa4f 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 6f9f9db..6a29b75 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",
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to