From c0b31ba201e09130fa56ed8c9390b632e7268216 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Wed, 27 Jun 2012 12:06:57 -0300 Subject: [PATCH] --- yaml --- r: 330740 b: refs/heads/master c: b1e71f31cb315cdc3be5a861b2eaab7401b70295 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/ispqueue.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 04b713397145..3bf8cefdcdcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13eaaa7f2fa1d2bd247d68792bf187239a24a33f +refs/heads/master: b1e71f31cb315cdc3be5a861b2eaab7401b70295 diff --git a/trunk/drivers/media/video/omap3isp/ispqueue.c b/trunk/drivers/media/video/omap3isp/ispqueue.c index 9bebb1e57aab..e912f0cbd6ef 100644 --- a/trunk/drivers/media/video/omap3isp/ispqueue.c +++ b/trunk/drivers/media/video/omap3isp/ispqueue.c @@ -908,13 +908,14 @@ int omap3isp_video_queue_qbuf(struct isp_video_queue *queue, * * 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)