diff options
Diffstat (limited to 'drivers/media/video/video-buf-dvb.c')
| -rw-r--r-- | drivers/media/video/video-buf-dvb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c index d2af82dc8faf..9631ead297ee 100644 --- a/drivers/media/video/video-buf-dvb.c +++ b/drivers/media/video/video-buf-dvb.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/file.h> | 22 | #include <linux/file.h> |
| 23 | #include <linux/freezer.h> | 23 | #include <linux/freezer.h> |
| 24 | 24 | ||
| 25 | #include <media/video-buf.h> | 25 | #include <media/videobuf-dma-sg.h> |
| 26 | #include <media/video-buf-dvb.h> | 26 | #include <media/video-buf-dvb.h> |
| 27 | 27 | ||
| 28 | /* ------------------------------------------------------------------ */ | 28 | /* ------------------------------------------------------------------ */ |
| @@ -45,6 +45,7 @@ static int videobuf_dvb_thread(void *data) | |||
| 45 | struct videobuf_buffer *buf; | 45 | struct videobuf_buffer *buf; |
| 46 | unsigned long flags; | 46 | unsigned long flags; |
| 47 | int err; | 47 | int err; |
| 48 | struct videobuf_dmabuf *dma; | ||
| 48 | 49 | ||
| 49 | dprintk("dvb thread started\n"); | 50 | dprintk("dvb thread started\n"); |
| 50 | set_freezable(); | 51 | set_freezable(); |
| @@ -65,8 +66,9 @@ static int videobuf_dvb_thread(void *data) | |||
| 65 | try_to_freeze(); | 66 | try_to_freeze(); |
| 66 | 67 | ||
| 67 | /* feed buffer data to demux */ | 68 | /* feed buffer data to demux */ |
| 69 | dma=videobuf_to_dma(buf); | ||
| 68 | if (buf->state == STATE_DONE) | 70 | if (buf->state == STATE_DONE) |
| 69 | dvb_dmx_swfilter(&dvb->demux, buf->dma.vmalloc, | 71 | dvb_dmx_swfilter(&dvb->demux, dma->vmalloc, |
| 70 | buf->size); | 72 | buf->size); |
| 71 | 73 | ||
| 72 | /* requeue buffer */ | 74 | /* requeue buffer */ |
