From b5a081ba0da8484e1778d497f3773e170f589e94 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 10 Oct 2011 11:09:54 -0300 Subject: [PATCH] --- yaml --- r: 271957 b: refs/heads/master c: f88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9 h: refs/heads/master i: 271955: 0f86b0d78b1cf602633c853e17f3830f0533731c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-video.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 138ec050a416..a75af3299ba9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79776c89e0e52fce23d8c85f765a879ed20e760f +refs/heads/master: f88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9 diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c index 5496ca29d039..53d9f9dd927d 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-video.c +++ b/trunk/drivers/media/video/cx23885/cx23885-video.c @@ -1563,9 +1563,22 @@ int cx23885_video_register(struct cx23885_dev *dev) dev->name); goto fail_unreg; } - printk(KERN_INFO "%s/0: registered device %s [v4l2]\n", + printk(KERN_INFO "%s: registered device %s [v4l2]\n", dev->name, video_device_node_name(dev->video_dev)); + /* register VBI device */ + dev->vbi_dev = cx23885_vdev_init(dev, dev->pci, + &cx23885_vbi_template, "vbi"); + err = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, + vbi_nr[dev->nr]); + if (err < 0) { + printk(KERN_INFO "%s: can't register vbi device\n", + dev->name); + goto fail_unreg; + } + printk(KERN_INFO "%s: registered device %s\n", + dev->name, video_device_node_name(dev->vbi_dev)); + /* Register ALSA audio device */ dev->audio_dev = cx23885_audio_register(dev);