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>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index eb2c12eb2fc8..e04113f0b7e2 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/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);
                 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)
 {
         pci_unregister_driver(&bttv_pci_driver);
         bus_unregister(&bttv_sub_bus_type);
-        return;
 }
 
 module_init(bttv_init_module);