openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] vb2: vb2_poll() fix return values for file I/O mode 

poll() should be returning poll-specific error values, not E* errors.

Signed-off-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Pawel Osciak 2011-03-20 18:17:34 -03:00 committed by Mauro Carvalho Chehab
parent 950720840f
commit 4ffabdb35a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/videobuf2-core.c
View File

@ -1364,18 +1364,18 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
struct vb2_buffer *vb = NULL; struct vb2_buffer *vb = NULL;
/* /*
* Start file io emulator if streaming api has not been used yet. * Start file I/O emulator only if streaming API has not been used yet.
*/ */
if (q->num_buffers == 0 && q->fileio == NULL) { if (q->num_buffers == 0 && q->fileio == NULL) {
if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ)) { if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ)) {
ret = __vb2_init_fileio(q, 1); ret = __vb2_init_fileio(q, 1);
if (ret) if (ret)
return ret; return POLLERR;
} }
if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE)) { if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE)) {
ret = __vb2_init_fileio(q, 0); ret = __vb2_init_fileio(q, 0);
if (ret) if (ret)
return ret; return POLLERR;
/* /*
* Write to OUTPUT queue can be done immediately. * Write to OUTPUT queue can be done immediately.
*/ */