From 0bc89d11e3af0160a8320a39ece9b340949cbbce Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 10 Mar 2011 09:10:49 -0300 Subject: [PATCH] --- yaml --- r: 242071 b: refs/heads/master c: 72f1fc33a76a115e8c67f7b052bd7f6e129cda50 h: refs/heads/master i: 242069: 5833c3008e2af600dd075958bab5214edde577fc 242067: 3dfab4c3c6707932da3a34eb4cc1cc52341f3dd6 242063: b96163f16f45f701573b70055829b500c9571b18 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-core.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1424f6d7ecfe..ed731e20c63b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31901a078af29c33c736dcbf815656920e904632 +refs/heads/master: 72f1fc33a76a115e8c67f7b052bd7f6e129cda50 diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c index 2baf7dbdc01d..3e9b67bd55b9 100644 --- a/trunk/drivers/media/video/videobuf2-core.c +++ b/trunk/drivers/media/video/videobuf2-core.c @@ -227,7 +227,7 @@ static void __vb2_free_mem(struct vb2_queue *q) * and return the queue to an uninitialized state. Might be called even if the * queue has already been freed. */ -static int __vb2_queue_free(struct vb2_queue *q) +static void __vb2_queue_free(struct vb2_queue *q) { unsigned int buffer; @@ -251,8 +251,6 @@ static int __vb2_queue_free(struct vb2_queue *q) q->num_buffers = 0; q->memory = 0; - - return 0; } /** @@ -505,9 +503,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) return -EBUSY; } - ret = __vb2_queue_free(q); - if (ret != 0) - return ret; + __vb2_queue_free(q); /* * In case of REQBUFS(0) return immediately without calling