From 49e37e06c8fb39a58e268c3a828bcb8654204003 Mon Sep 17 00:00:00 2001 From: Pawel Osciak Date: Sun, 20 Mar 2011 18:17:34 -0300 Subject: [PATCH] --- yaml --- r: 242099 b: refs/heads/master c: 4ffabdb35ad59fdb8cb6ad3ff4733694ff0dfc35 h: refs/heads/master i: 242097: fdd187ce49c0bfba920d010767e61c914f087b9b 242095: 7e90c6bfd29c862d51f1bbd6dcbc8f33b9fb504b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a8c4d13ed852..738893a9a6a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 950720840f392075b19d902e5ca7806a17a562cb +refs/heads/master: 4ffabdb35ad59fdb8cb6ad3ff4733694ff0dfc35 diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c index ce032255f3ee..8c6f04bc4d89 100644 --- a/trunk/drivers/media/video/videobuf2-core.c +++ b/trunk/drivers/media/video/videobuf2-core.c @@ -1364,18 +1364,18 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) 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 (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ)) { ret = __vb2_init_fileio(q, 1); if (ret) - return ret; + return POLLERR; } if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE)) { ret = __vb2_init_fileio(q, 0); if (ret) - return ret; + return POLLERR; /* * Write to OUTPUT queue can be done immediately. */