diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-core.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 80108ddf483..a1d986e01a3 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -236,9 +236,10 @@ int saa7134_buffer_startpage(struct saa7134_buf *buf) | |||
236 | unsigned long saa7134_buffer_base(struct saa7134_buf *buf) | 236 | unsigned long saa7134_buffer_base(struct saa7134_buf *buf) |
237 | { | 237 | { |
238 | unsigned long base; | 238 | unsigned long base; |
239 | struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); | ||
239 | 240 | ||
240 | base = saa7134_buffer_startpage(buf) * 4096; | 241 | base = saa7134_buffer_startpage(buf) * 4096; |
241 | base += buf->vb.dma.sglist[0].offset; | 242 | base += dma->sglist[0].offset; |
242 | return base; | 243 | return base; |
243 | } | 244 | } |
244 | 245 | ||
@@ -286,11 +287,12 @@ void saa7134_pgtable_free(struct pci_dev *pci, struct saa7134_pgtable *pt) | |||
286 | 287 | ||
287 | void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf) | 288 | void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf) |
288 | { | 289 | { |
290 | struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); | ||
289 | BUG_ON(in_interrupt()); | 291 | BUG_ON(in_interrupt()); |
290 | 292 | ||
291 | videobuf_waiton(&buf->vb,0,0); | 293 | videobuf_waiton(&buf->vb,0,0); |
292 | videobuf_dma_unmap(q, &buf->vb.dma); | 294 | videobuf_dma_unmap(q, dma); |
293 | videobuf_dma_free(&buf->vb.dma); | 295 | videobuf_dma_free(dma); |
294 | buf->vb.state = STATE_NEEDS_INIT; | 296 | buf->vb.state = STATE_NEEDS_INIT; |
295 | } | 297 | } |
296 | 298 | ||