diff options
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index ab6593c16..9462086c6 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -736,8 +736,6 @@ static int video_end(struct saa7146_fh *fh, struct file *file) vv->streaming = NULL; - videobuf_queue_cancel(file,&fh->video_q); - spin_unlock_irqrestore(&dev->slock, flags); return 0; @@ -1104,8 +1102,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int int *type = arg; DEB_D(("VIDIOC_STREAMOFF, type:%d\n",*type)); - video_end(fh, file); err = videobuf_streamoff(file,q); + video_end(fh, file); return err; } case VIDIOCGMBUF: |