---

yaml --- r: 242071 b: refs/heads/master c: 72f1fc3 h: refs/heads/master i: 242069: 5833c30 242067: 3dfab4c 242063: b96163f v: v3
git-mirror · Mar 22, 2011 · 0bc89d1 · 0bc89d1
1 parent d68df90
commit 0bc89d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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