1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index 6504e40a31d..96046957bf2 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -2228,6 +2228,10 @@ static __init int vpif_probe(struct platform_device *pdev)
                 common = &(ch->common[VPIF_VIDEO_INDEX]);
                 spin_lock_init(&common->irqlock);
                 mutex_init(&common->lock);
+                /* Locking in file operations other than ioctl should be done
+                   by the driver, not the V4L2 core.
+                   This driver needs auditing so that this flag can be removed. */
+                set_bit(V4L2_FL_LOCK_ALL_FOPS, &ch->video_dev->flags);
                 ch->video_dev->lock = &common->lock;
                 /* Initialize prio member of channel object */
                 v4l2_prio_init(&ch->prio);