From d0e3a0d93bd3e461e49bd81d5986a0ddac238725 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 28 Mar 2010 08:09:44 -0300
Subject: [PATCH] --- yaml --- r: 193023 b: refs/heads/master c:
 a4cf4cac2979a828e7cd0a3cd02d7a5308a44a7f h: refs/heads/master i:   193021:
 496b3e243324975e35033ffd6b4c4ada949d2c11   193019:
 8133ad372d7ce484113b8f7c330f30c80cb278d6   193015:
 b73111a7a39afcfd95eb4de81b5f5c0bc9a21d3f   193007:
 46523ecc05ddb28085f8bc0f61e36461bf3ab424   192991:
 6438cd51b8d89235003f8ec41555b11df57ad0a7   192959:
 e2e487506eb6bc150db77f1f1978a84fec4eefee   192895:
 96171b06c5d670649fa1ef9158ab525f6cf7665c   192767:
 09a5654fad59edc0e44e23c367d9f3c0e3897b9a   192511:
 9325e2bfdab79e49b7c0cb495169b590fb8ee8d3 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/videobuf-core.c       | 2 +-
 trunk/drivers/media/video/videobuf-dma-contig.c | 2 +-
 trunk/drivers/media/video/videobuf-dma-sg.c     | 2 +-
 trunk/drivers/media/video/videobuf-vmalloc.c    | 2 +-
 trunk/include/media/videobuf-core.h             | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9a98df578d1a..5447c2dfd885 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63e424856b4ab0652c58f75a2d2ecb9c1f95db27
+refs/heads/master: a4cf4cac2979a828e7cd0a3cd02d7a5308a44a7f
diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c
index d76a7d500029..7b69f6b00a3d 100644
--- a/trunk/drivers/media/video/videobuf-core.c
+++ b/trunk/drivers/media/video/videobuf-core.c
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL");
 #define CALL(q, f, arg...)						\
 	((q->int_ops->f) ? q->int_ops->f(arg) : 0)
 
-void *videobuf_alloc(struct videobuf_queue *q)
+struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q)
 {
 	struct videobuf_buffer *vb;
 
diff --git a/trunk/drivers/media/video/videobuf-dma-contig.c b/trunk/drivers/media/video/videobuf-dma-contig.c
index 0a32cf810c88..76e158feca61 100644
--- a/trunk/drivers/media/video/videobuf-dma-contig.c
+++ b/trunk/drivers/media/video/videobuf-dma-contig.c
@@ -190,7 +190,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
 	return ret;
 }
 
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
 {
 	struct videobuf_dma_contig_memory *mem;
 	struct videobuf_buffer *vb;
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c
index 7ff275e30092..014eb63c0960 100644
--- a/trunk/drivers/media/video/videobuf-dma-sg.c
+++ b/trunk/drivers/media/video/videobuf-dma-sg.c
@@ -439,7 +439,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
 	struct videobuf_dma_sg_memory
  */
 
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
 {
 	struct videobuf_dma_sg_memory *mem;
 	struct videobuf_buffer *vb;
diff --git a/trunk/drivers/media/video/videobuf-vmalloc.c b/trunk/drivers/media/video/videobuf-vmalloc.c
index 43c92882e4c5..000a60fc456e 100644
--- a/trunk/drivers/media/video/videobuf-vmalloc.c
+++ b/trunk/drivers/media/video/videobuf-vmalloc.c
@@ -135,7 +135,7 @@ static const struct vm_operations_struct videobuf_vm_ops = {
 	struct videobuf_dma_sg_memory
  */
 
-static void *__videobuf_alloc(size_t size)
+static struct videobuf_buffer *__videobuf_alloc(size_t size)
 {
 	struct videobuf_vmalloc_memory *mem;
 	struct videobuf_buffer *vb;
diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h
index 22d5a02884ad..4497e23c9d29 100644
--- a/trunk/include/media/videobuf-core.h
+++ b/trunk/include/media/videobuf-core.h
@@ -127,7 +127,7 @@ struct videobuf_queue_ops {
 struct videobuf_qtype_ops {
 	u32                     magic;
 
-	void *(*alloc)		(size_t size);
+	struct videobuf_buffer *(*alloc)(size_t size);
 	void *(*vmalloc)	(struct videobuf_buffer *buf);
 	int (*iolock)		(struct videobuf_queue *q,
 				 struct videobuf_buffer *vb,
@@ -182,7 +182,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
 int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
 		struct v4l2_framebuffer *fbuf);
 
-void *videobuf_alloc(struct videobuf_queue* q);
+struct videobuf_buffer *videobuf_alloc(struct videobuf_queue *q);
 
 /* Used on videobuf-dvb */
 void *videobuf_queue_to_vmalloc(struct videobuf_queue *q,