1 files changed, 1 insertions, 16 deletions

diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index bd25323bd947..2709b83d57b1 100644
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -94,7 +94,6 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
         struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
         struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
         unsigned int lines, llength, size;
-        int ret;
 
         dprintk("buffer_prepare [%p]\n", buf);
 
@@ -108,25 +107,11 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
         vb2_set_plane_payload(vb2, 0, size);
         vb2->v4l2_buf.field = dev->field;
 
-        ret = dma_map_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-        if (!ret)
-                return -EIO;
         return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
                                     saa7134_buffer_startpage(buf));
 }
 EXPORT_SYMBOL_GPL(saa7134_ts_buffer_prepare);
 
-void saa7134_ts_buffer_finish(struct vb2_buffer *vb2)
-{
-        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
-
-        dma_unmap_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-}
-EXPORT_SYMBOL_GPL(saa7134_ts_buffer_finish);
-
 int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                            unsigned int *nbuffers, unsigned int *nplanes,
                            unsigned int sizes[], void *alloc_ctxs[])
@@ -142,6 +127,7 @@ int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                 *nbuffers = 3;
         *nplanes = 1;
         sizes[0] = size;
+        alloc_ctxs[0] = dev->alloc_ctx;
         return 0;
 }
 EXPORT_SYMBOL_GPL(saa7134_ts_queue_setup);
@@ -187,7 +173,6 @@ struct vb2_ops saa7134_ts_qops = {
         .queue_setup    = saa7134_ts_queue_setup,
         .buf_init       = saa7134_ts_buffer_init,
         .buf_prepare    = saa7134_ts_buffer_prepare,
-        .buf_finish     = saa7134_ts_buffer_finish,
         .buf_queue      = saa7134_vb2_buffer_queue,
         .wait_prepare   = vb2_ops_wait_prepare,
         .wait_finish    = vb2_ops_wait_finish,