diff options
| author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 11:09:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 17:09:35 -0300 |
| commit | f88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9 (patch) | |
| tree | 5796b1892639ae6000445b9b3d52b0421eaae2ef /drivers/media/video/cx23885 | |
| parent | 79776c89e0e52fce23d8c85f765a879ed20e760f (diff) | |
| download | linux-f88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9.tar.gz linux-f88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9.tar.bz2 linux-f88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9.zip | |
[media] cx23885: minor printk cleanups and device registration
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 5496ca29d039..53d9f9dd927d 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/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); |