1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a88b56e6ca05..c02d92deacd2 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3827,10 +3827,7 @@ static int bttv_release(struct inode *inode, struct file *file)
 
         /* stop vbi capture */
         if (check_btres(fh, RESOURCE_VBI)) {
-                if (fh->vbi.streaming)
-                        videobuf_streamoff(&fh->vbi);
-                if (fh->vbi.reading)
-                        videobuf_read_stop(&fh->vbi);
+                videobuf_stop(&fh->vbi);
                 free_btres(btv,fh,RESOURCE_VBI);
         }
 
@@ -4988,7 +4985,7 @@ static struct pci_driver bttv_pci_driver = {
 #endif
 };
 
-static int bttv_init_module(void)
+static int __init bttv_init_module(void)
 {
         int ret;
 
@@ -5021,7 +5018,7 @@ static int bttv_init_module(void)
         return pci_register_driver(&bttv_pci_driver);
 }
 
-static void bttv_cleanup_module(void)
+static void __exit bttv_cleanup_module(void)
 {
         pci_unregister_driver(&bttv_pci_driver);
         bus_unregister(&bttv_sub_bus_type);