summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Jones <michael.jones@matrix-vision.de>2012-06-27 19:06:57 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-11 22:55:28 +0400
commitb1e71f31cb315cdc3be5a861b2eaab7401b70295 (patch)
tree115f5cb2c4eaee665c6579b33e21b865c05dde09 /drivers/media
parent13eaaa7f2fa1d2bd247d68792bf187239a24a33f (diff)
downloadlinux-b1e71f31cb315cdc3be5a861b2eaab7401b70295.tar.xz
[media] omap3isp: queue: Fix omap3isp_video_queue_dqbuf() description comment
Signed-off-by: Michael Jones <michael.jones@matrix-vision.de> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/omap3isp/ispqueue.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/omap3isp/ispqueue.c b/drivers/media/video/omap3isp/ispqueue.c
index 9bebb1e57aab..e912f0cbd6ef 100644
--- a/drivers/media/video/omap3isp/ispqueue.c
+++ b/drivers/media/video/omap3isp/ispqueue.c
@@ -908,13 +908,14 @@ done:
*
* This function is intended to be used as a VIDIOC_DQBUF ioctl handler.
*
- * The v4l2_buffer structure passed from userspace is first sanity tested. If
- * sane, the buffer is then processed and added to the main queue and, if the
- * queue is streaming, to the IRQ queue.
+ * Wait until a buffer is ready to be dequeued, remove it from the queue and
+ * copy its information to the v4l2_buffer structure.
*
- * Before being enqueued, USERPTR buffers are checked for address changes. If
- * the buffer has a different userspace address, the old memory area is unlocked
- * and the new memory area is locked.
+ * If the nonblocking argument is not zero and no buffer is ready, return
+ * -EAGAIN immediately instead of waiting.
+ *
+ * If no buffer has been enqueued, or if the requested buffer type doesn't match
+ * the queue type, return -EINVAL.
*/
int omap3isp_video_queue_dqbuf(struct isp_video_queue *queue,
struct v4l2_buffer *vbuf, int nonblocking)