From 277e3a117b3dbfb17f004f934937e749e8ae8a36 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Mon, 17 Dec 2007 14:26:29 -0300 Subject: [PATCH] --- yaml --- r: 76608 b: refs/heads/master c: 9e7e85ebaeba22979209268423f5aae8a352df4c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bt8xx/bttv-driver.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5321cb8944ec..e00b6274266f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71021d2601c54eee6df3afaf79aed430b17e1366 +refs/heads/master: 9e7e85ebaeba22979209268423f5aae8a352df4c diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c index eb2c12eb2fc8..e04113f0b7e2 100644 --- a/trunk/drivers/media/video/bt8xx/bttv-driver.c +++ b/trunk/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);