4 files changed, 25 insertions, 4 deletions

diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 848a2d0e1233..fc51e4918bbf 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -94,6 +94,13 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
         return CALL(q, iolock, q, vb, fbuf);
 }
 
+void *videobuf_queue_to_vmalloc (struct videobuf_queue *q,
+                           struct videobuf_buffer *buf)
+{
+        return CALL(q, vmalloc, buf);
+}
+EXPORT_SYMBOL_GPL(videobuf_queue_to_vmalloc);
+
 /* --------------------------------------------------------------------- */
 
 
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index c0b7902862e4..03a7b946bd54 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -432,6 +432,16 @@ static void *__videobuf_alloc(size_t size)
         return vb;
 }
 
+static void *__videobuf_to_vmalloc (struct videobuf_buffer *buf)
+{
+        struct videobuf_dma_sg_memory *mem = buf->priv;
+        BUG_ON(!mem);
+
+        MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);
+
+        return mem->dma.vmalloc;
+}
+
 static int __videobuf_iolock (struct videobuf_queue* q,
                               struct videobuf_buffer *vb,
                               struct v4l2_framebuffer *fbuf)
@@ -677,6 +687,7 @@ static struct videobuf_qtype_ops sg_ops = {
         .mmap_mapper  = __videobuf_mmap_mapper,
         .video_copy_to_user = __videobuf_copy_to_user,
         .copy_stream  = __videobuf_copy_stream,
+        .vmalloc      = __videobuf_to_vmalloc,
 };
 
 void *videobuf_sg_alloc(size_t size)
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index 0f8542a4c71a..6e4d73ec6855 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -20,9 +20,10 @@
 #include <linux/fs.h>
 #include <linux/kthread.h>
 #include <linux/file.h>
+
 #include <linux/freezer.h>
 
-#include <media/videobuf-dma-sg.h>
+#include <media/videobuf-core.h>
 #include <media/videobuf-dvb.h>
 
 /* ------------------------------------------------------------------ */
@@ -45,7 +46,7 @@ static int videobuf_dvb_thread(void *data)
         struct videobuf_buffer *buf;
         unsigned long flags;
         int err;
-        struct videobuf_dmabuf *dma;
+        void *outp;
 
         dprintk("dvb thread started\n");
         set_freezable();
@@ -66,9 +67,10 @@ static int videobuf_dvb_thread(void *data)
                 try_to_freeze();
 
                 /* feed buffer data to demux */
-                dma=videobuf_to_dma(buf);
+                outp = videobuf_queue_to_vmalloc (&dvb->dvbq, buf);
+
                 if (buf->state == VIDEOBUF_DONE)
-                        dvb_dmx_swfilter(&dvb->demux, dma->vmalloc,
+                        dvb_dmx_swfilter(&dvb->demux, outp,
                                          buf->size);
 
                 /* requeue buffer */
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index d68d0273807b..c91e1d8e3802 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -387,6 +387,7 @@ static struct videobuf_qtype_ops qops = {
         .mmap_mapper  = __videobuf_mmap_mapper,
         .video_copy_to_user = __videobuf_copy_to_user,
         .copy_stream  = __videobuf_copy_stream,
+        .vmalloc      = videobuf_to_vmalloc,
 };
 
 void videobuf_queue_vmalloc_init(struct videobuf_queue* q,