Commit 69b95a3a authored Feb 07, 2013 by Sylwester Nawrocki Committed by Mauro Carvalho Chehab Mar 05, 2013

[media] s3c-camif: Fail on insufficient number of allocated buffers



Ensure the driver gets always at least its minimum required
number of buffers allocated by checking actual number of
allocated buffers in vb2_reqbufs(). And free any partially
allocated buffer queue with signaling an error to user space.
Without this patch applications may wait forever to dequeue
a filled buffer, because the hardware didn't even start after
VIDIOC_STREAMON, VIDIOC_QBUF calls, due to insufficient number
of empty buffers.

Reported-by: Alexander Nestorov <alexandernst@gmail.com>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 6aa69f99

drivers/media/platform/s3c-camif/camif-capture.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -934,11 +934,18 @@ static int s3c_camif_reqbufs(struct file file, void priv,
		vp->owner = NULL;

		ret = vb2_reqbufs(&vp->vb_queue, rb);
		if (!ret) {
		if (ret < 0)
		return ret;

		if (rb->count && rb->count < CAMIF_REQ_BUFS_MIN) {
		rb->count = 0;
		vb2_reqbufs(&vp->vb_queue, rb);
		ret = -ENOMEM;
		}

		vp->reqbufs_count = rb->count;
		if (vp->owner == NULL && rb->count > 0)
		vp->owner = priv;
		}

		return ret;
		}