1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 57a11e71d996..aeef80f88a6b 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -993,7 +993,7 @@ static int buffer_prepare(struct videobuf_queue *q,
             buf->vb.size   != size       ||
             buf->vb.field  != field      ||
             buf->fmt       != fh->fmt) {
-                saa7134_dma_free(dev,buf);
+                saa7134_dma_free(q,buf);
         }
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
@@ -1004,7 +1004,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 buf->fmt       = fh->fmt;
                 buf->pt        = &fh->pt_cap;
 
-                err = videobuf_iolock(dev->pci,&buf->vb,&dev->ovbuf);
+                err = videobuf_iolock(q,&buf->vb,&dev->ovbuf);
                 if (err)
                         goto oops;
                 err = saa7134_pgtable_build(dev->pci,buf->pt,
@@ -1019,7 +1019,7 @@ static int buffer_prepare(struct videobuf_queue *q,
         return 0;
 
  oops:
-        saa7134_dma_free(dev,buf);
+        saa7134_dma_free(q,buf);
         return err;
 }
 
@@ -1045,10 +1045,9 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct saa7134_fh *fh = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
 
-        saa7134_dma_free(fh->dev,buf);
+        saa7134_dma_free(q,buf);
 }
 
 static struct videobuf_queue_ops video_qops = {