aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-07-15 08:08:26 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-07-29 16:22:15 -0400
commitc526e224e4075eff788a992f59bc4a9006b12923 (patch)
tree8c6f5b8389c0b145317b9fbc9e9bcd6a62d7a0cb /drivers/media
parent6ba475042f0ca54bf055ce94b2a1e4656ed143f9 (diff)
V4L/DVB (4298): Check all __must_check warnings in bttv.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5764a89d3562..63e83162286c 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3909,6 +3909,8 @@ static void bttv_unregister_video(struct bttv *btv)
3909/* register video4linux devices */ 3909/* register video4linux devices */
3910static int __devinit bttv_register_video(struct bttv *btv) 3910static int __devinit bttv_register_video(struct bttv *btv)
3911{ 3911{
3912 int ret;
3913
3912 if (no_overlay <= 0) { 3914 if (no_overlay <= 0) {
3913 bttv_video_template.type |= VID_TYPE_OVERLAY; 3915 bttv_video_template.type |= VID_TYPE_OVERLAY;
3914 } else { 3916 } else {
@@ -3923,7 +3925,10 @@ static int __devinit bttv_register_video(struct bttv *btv)
3923 goto err; 3925 goto err;
3924 printk(KERN_INFO "bttv%d: registered device video%d\n", 3926 printk(KERN_INFO "bttv%d: registered device video%d\n",
3925 btv->c.nr,btv->video_dev->minor & 0x1f); 3927 btv->c.nr,btv->video_dev->minor & 0x1f);
3926 video_device_create_file(btv->video_dev, &class_device_attr_card); 3928 ret = video_device_create_file(btv->video_dev, &class_device_attr_card);
3929 if (ret < 0)
3930 printk(KERN_WARNING "bttv: video_device_create_file error: "
3931 "%d\n", ret);
3927 3932
3928 /* vbi */ 3933 /* vbi */
3929 btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi"); 3934 btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi");
@@ -4287,6 +4292,8 @@ static struct pci_driver bttv_pci_driver = {
4287 4292
4288static int bttv_init_module(void) 4293static int bttv_init_module(void)
4289{ 4294{
4295 int ret;
4296
4290 bttv_num = 0; 4297 bttv_num = 0;
4291 4298
4292 printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n", 4299 printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",
@@ -4308,7 +4315,11 @@ static int bttv_init_module(void)
4308 4315
4309 bttv_check_chipset(); 4316 bttv_check_chipset();
4310 4317
4311 bus_register(&bttv_sub_bus_type); 4318 ret = bus_register(&bttv_sub_bus_type);
4319 if (ret < 0) {
4320 printk(KERN_WARNING "bttv: bus_register error: %d\n", ret);
4321 return ret;
4322 }
4312 return pci_register_driver(&bttv_pci_driver); 4323 return pci_register_driver(&bttv_pci_driver);
4313} 4324}
4314 4325