[media] Fix vivi regression (d9762df4) · Commits · 戴 / test

This patch fixes a regression introduced by commit : [media] v4l2-dev: add flag to have the core lock all file operations I forgot to add the locks to the vivi read operation. Regards, Hans Signed-off-by:

Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/video/vivi.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1149,10 +1149,14 @@ static ssize_t
		vivi_read(struct file file, char __user data, size_t count, loff_t *ppos)
		{
		struct vivi_dev *dev = video_drvdata(file);
		int err;

		dprintk(dev, 1, "read called\n");
		return vb2_read(&dev->vb_vidq, data, count, ppos,
		mutex_lock(&dev->mutex);
		err = vb2_read(&dev->vb_vidq, data, count, ppos,
		file->f_flags & O_NONBLOCK);
		mutex_unlock(&dev->mutex);
		return err;
		}

		static unsigned int

Admin message