Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] vb2: fix wrong owner check

Browse Source 
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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-09-07 12:50:02 -03:00 committed by Mauro Carvalho Chehab
parent d2210f9e2e
commit 8c82c75c39
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/v4l2-core/videobuf2-core.c
View File

@ -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,
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)