From: Németh Márton Date: Wed, 29 Apr 2009 18:57:24 +0000 (-0300) Subject: V4L/DVB (11736): videobuf: modify return value of VIDIOC_REQBUFS ioctl X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=925d74ae717c9a12d3618eb4b36b9fb632e2cef3;p=deliverable%2Flinux.git V4L/DVB (11736): videobuf: modify return value of VIDIOC_REQBUFS ioctl The V4L2 ioctls usually return 0 when the operation was successful and -1 in case of error. Currently VIDIOC_REQBUFS returns the number of buffers which is redundant because this information is available in count field of struct v4l2_requestbuffers. The V4L2 API specification, revision 0.24 [1] explicitly specifies for VIDIOC_REQBUFS that the return value shall be 0 on success. The patch was tested with v4l-test 0.13 [2] with vivi driver. References: [1] V4L2 API specification, revision 0.24 http://v4l2spec.bytesex.org/spec/r13696.htm [2] v4l-test: Test environment for Video For Linux Two API http://v4l-test.sourceforge.net/ Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index b7b05842cf28..29b3c693a8e4 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c @@ -439,6 +439,7 @@ int videobuf_reqbufs(struct videobuf_queue *q, } req->count = retval; + retval = 0; done: mutex_unlock(&q->vb_lock);