aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-video.c
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2011-10-10 10:09:54 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-14 16:09:35 -0400
commitf88fb8e9385eaec2e7c0527ccc0d947fbbe4c5f9 (patch)
tree5796b1892639ae6000445b9b3d52b0421eaae2ef /drivers/media/video/cx23885/cx23885-video.c
parent79776c89e0e52fce23d8c85f765a879ed20e760f (diff)
[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/cx23885-video.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c15
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)
1563 dev->name); 1563 dev->name);
1564 goto fail_unreg; 1564 goto fail_unreg;
1565 } 1565 }
1566 printk(KERN_INFO "%s/0: registered device %s [v4l2]\n", 1566 printk(KERN_INFO "%s: registered device %s [v4l2]\n",
1567 dev->name, video_device_node_name(dev->video_dev)); 1567 dev->name, video_device_node_name(dev->video_dev));
1568 1568
1569 /* register VBI device */
1570 dev->vbi_dev = cx23885_vdev_init(dev, dev->pci,
1571 &cx23885_vbi_template, "vbi");
1572 err = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
1573 vbi_nr[dev->nr]);
1574 if (err < 0) {
1575 printk(KERN_INFO "%s: can't register vbi device\n",
1576 dev->name);
1577 goto fail_unreg;
1578 }
1579 printk(KERN_INFO "%s: registered device %s\n",
1580 dev->name, video_device_node_name(dev->vbi_dev));
1581
1569 /* Register ALSA audio device */ 1582 /* Register ALSA audio device */
1570 dev->audio_dev = cx23885_audio_register(dev); 1583 dev->audio_dev = cx23885_audio_register(dev);
1571 1584