6 files changed, 6 insertions, 20 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a88b56e6ca0..2182ef089eb 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);
         }
 
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index f33f0b47142..f802b565356 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1085,10 +1085,7 @@ static int mpeg_release(struct inode *inode, struct file *file)
 
         cx8802_cancel_buffers(fh->dev);
         /* stop mpeg capture */
-        if (fh->mpegq.streaming)
-                videobuf_streamoff(&fh->mpegq);
-        if (fh->mpegq.reading)
-                videobuf_read_stop(&fh->mpegq);
+        videobuf_stop(&fh->mpegq);
 
         videobuf_mmap_free(&fh->mpegq);
         file->private_data = NULL;
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 5ee05f8f3fa..c84dafbdb99 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -851,10 +851,7 @@ static int video_release(struct inode *inode, struct file *file)
 
         /* stop vbi capture */
         if (res_check(fh, RESOURCE_VBI)) {
-                if (fh->vbiq.streaming)
-                        videobuf_streamoff(&fh->vbiq);
-                if (fh->vbiq.reading)
-                        videobuf_read_stop(&fh->vbiq);
+                videobuf_stop(&fh->vbiq);
                 res_free(dev,fh,RESOURCE_VBI);
         }
 
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 75d0c5bf46d..9322f44865b 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -110,11 +110,8 @@ static int ts_release(struct inode *inode, struct file *file)
 {
         struct saa7134_dev *dev = file->private_data;
 
-        if (dev->empress_tsq.streaming)
-                videobuf_streamoff(&dev->empress_tsq);
         mutex_lock(&dev->empress_tsq.lock);
-        if (dev->empress_tsq.reading)
-                videobuf_read_stop(&dev->empress_tsq);
+        videobuf_stop(&dev->empress_tsq);
         videobuf_mmap_free(&dev->empress_tsq);
         dev->empress_users--;
 
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 3b9ffb4b648..6396d9b5c06 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1445,10 +1445,7 @@ static int video_release(struct inode *inode, struct file *file)
 
         /* stop vbi capture */
         if (res_check(fh, RESOURCE_VBI)) {
-                if (fh->vbi.streaming)
-                        videobuf_streamoff(&fh->vbi);
-                if (fh->vbi.reading)
-                        videobuf_read_stop(&fh->vbi);
+                videobuf_stop(&fh->vbi);
                 res_free(dev,fh,RESOURCE_VBI);
         }
 
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index ee73dc75131..9b54ff9d2e3 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1076,6 +1076,7 @@ static int vivi_release(struct inode *inode, struct file *file)
         int minor = iminor(inode);
 
         vivi_stop_thread(vidq);
+        videobuf_stop(&fh->vb_vidq);
         videobuf_mmap_free(&fh->vb_vidq);
 
         kfree (fh);