Commit 8c82c75c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] vb2: fix wrong owner check

Check against q->fileio to see if the queue owner should be set or not.
The former check against the return value of read or write is wrong, since
read/write can return an error, even if the queue is in streaming mode.
For example, EAGAIN when in non-blocking mode.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d2210f9e
...@@ -2278,7 +2278,7 @@ ssize_t vb2_fop_write(struct file *file, char __user *buf, ...@@ -2278,7 +2278,7 @@ ssize_t vb2_fop_write(struct file *file, char __user *buf,
goto exit; goto exit;
err = vb2_write(vdev->queue, buf, count, ppos, err = vb2_write(vdev->queue, buf, count, ppos,
file->f_flags & O_NONBLOCK); file->f_flags & O_NONBLOCK);
if (err >= 0) if (vdev->queue->fileio)
vdev->queue->owner = file->private_data; vdev->queue->owner = file->private_data;
exit: exit:
if (lock) if (lock)
...@@ -2300,7 +2300,7 @@ ssize_t vb2_fop_read(struct file *file, char __user *buf, ...@@ -2300,7 +2300,7 @@ ssize_t vb2_fop_read(struct file *file, char __user *buf,
goto exit; goto exit;
err = vb2_read(vdev->queue, buf, count, ppos, err = vb2_read(vdev->queue, buf, count, ppos,
file->f_flags & O_NONBLOCK); file->f_flags & O_NONBLOCK);
if (err >= 0) if (vdev->queue->fileio)
vdev->queue->owner = file->private_data; vdev->queue->owner = file->private_data;
exit: exit:
if (lock) if (lock)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment