Browse Source

V4L/DVB (6848): bttv: check pci_register_driver() error

Check pci_register_driver() error in module_init.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Akinobu Mita 17 years ago
parent
commit
9e7e85ebae
1 changed files with 5 additions and 2 deletions
  1. 5 2
      drivers/media/video/bt8xx/bttv-driver.c

+ 5 - 2
drivers/media/video/bt8xx/bttv-driver.c

@@ -4404,14 +4404,17 @@ static int __init bttv_init_module(void)
 		printk(KERN_WARNING "bttv: bus_register error: %d\n", ret);
 		printk(KERN_WARNING "bttv: bus_register error: %d\n", ret);
 		return ret;
 		return ret;
 	}
 	}
-	return pci_register_driver(&bttv_pci_driver);
+	ret = pci_register_driver(&bttv_pci_driver);
+	if (ret < 0)
+		bus_unregister(&bttv_sub_bus_type);
+
+	return ret;
 }
 }
 
 
 static void __exit bttv_cleanup_module(void)
 static void __exit bttv_cleanup_module(void)
 {
 {
 	pci_unregister_driver(&bttv_pci_driver);
 	pci_unregister_driver(&bttv_pci_driver);
 	bus_unregister(&bttv_sub_bus_type);
 	bus_unregister(&bttv_sub_bus_type);
-	return;
 }
 }
 
 
 module_init(bttv_init_module);
 module_init(bttv_init_module);