diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-20 07:37:17 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-20 07:37:17 -0200 |
| commit | 75cd5f355fe382a2645a959e6ff2beffa09019da (patch) | |
| tree | d78404ed6886ea5ab11db15af0ec3deb1bbd9952 /linux/drivers/media/video/bt8xx | |
| parent | d70b230414d9b4799b0091981a1d4f9cd55d9a84 (diff) | |
| parent | 3842afc175a16c86d1f3b719f07a3bfddf3c7815 (diff) | |
| download | mediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.gz mediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 3efc9465b..494afcbe6 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -4481,7 +4481,11 @@ static int __init bttv_init_module(void) return ret; } #endif - 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) @@ -4490,7 +4494,6 @@ static void __exit bttv_cleanup_module(void) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) bus_unregister(&bttv_sub_bus_type); #endif - return; } module_init(bttv_init_module); |