aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-dvb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/videobuf-dvb.c')
-rw-r--r--drivers/media/video/videobuf-dvb.c10
1 files changed, 6 insertions, 4 deletions
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 @@
20#include <linux/fs.h> 20#include <linux/fs.h>
21#include <linux/kthread.h> 21#include <linux/kthread.h>
22#include <linux/file.h> 22#include <linux/file.h>
23
23#include <linux/freezer.h> 24#include <linux/freezer.h>
24 25
25#include <media/videobuf-dma-sg.h> 26#include <media/videobuf-core.h>
26#include <media/videobuf-dvb.h> 27#include <media/videobuf-dvb.h>
27 28
28/* ------------------------------------------------------------------ */ 29/* ------------------------------------------------------------------ */
@@ -45,7 +46,7 @@ static int videobuf_dvb_thread(void *data)
45 struct videobuf_buffer *buf; 46 struct videobuf_buffer *buf;
46 unsigned long flags; 47 unsigned long flags;
47 int err; 48 int err;
48 struct videobuf_dmabuf *dma; 49 void *outp;
49 50
50 dprintk("dvb thread started\n"); 51 dprintk("dvb thread started\n");
51 set_freezable(); 52 set_freezable();
@@ -66,9 +67,10 @@ static int videobuf_dvb_thread(void *data)
66 try_to_freeze(); 67 try_to_freeze();
67 68
68 /* feed buffer data to demux */ 69 /* feed buffer data to demux */
69 dma=videobuf_to_dma(buf); 70 outp = videobuf_queue_to_vmalloc (&dvb->dvbq, buf);
71
70 if (buf->state == VIDEOBUF_DONE) 72 if (buf->state == VIDEOBUF_DONE)
71 dvb_dmx_swfilter(&dvb->demux, dma->vmalloc, 73 dvb_dmx_swfilter(&dvb->demux, outp,
72 buf->size); 74 buf->size);
73 75
74 /* requeue buffer */ 76 /* requeue buffer */