diff options
Diffstat (limited to 'drivers/media/common/saa7146_vbi.c')
-rw-r--r-- | drivers/media/common/saa7146_vbi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index 500bd3f05e16..063608462ebe 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c | |||
@@ -236,7 +236,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e | |||
236 | } | 236 | } |
237 | 237 | ||
238 | if (buf->vb.size != size) | 238 | if (buf->vb.size != size) |
239 | saa7146_dma_free(dev,buf); | 239 | saa7146_dma_free(dev,q,buf); |
240 | 240 | ||
241 | if (STATE_NEEDS_INIT == buf->vb.state) { | 241 | if (STATE_NEEDS_INIT == buf->vb.state) { |
242 | buf->vb.width = llength; | 242 | buf->vb.width = llength; |
@@ -247,7 +247,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e | |||
247 | saa7146_pgtable_free(dev->pci, &buf->pt[2]); | 247 | saa7146_pgtable_free(dev->pci, &buf->pt[2]); |
248 | saa7146_pgtable_alloc(dev->pci, &buf->pt[2]); | 248 | saa7146_pgtable_alloc(dev->pci, &buf->pt[2]); |
249 | 249 | ||
250 | err = videobuf_iolock(dev->pci,&buf->vb, NULL); | 250 | err = videobuf_iolock(q,&buf->vb, NULL); |
251 | if (err) | 251 | if (err) |
252 | goto oops; | 252 | goto oops; |
253 | err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen); | 253 | err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen); |
@@ -261,7 +261,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e | |||
261 | 261 | ||
262 | oops: | 262 | oops: |
263 | DEB_VBI(("error out.\n")); | 263 | DEB_VBI(("error out.\n")); |
264 | saa7146_dma_free(dev,buf); | 264 | saa7146_dma_free(dev,q,buf); |
265 | 265 | ||
266 | return err; | 266 | return err; |
267 | } | 267 | } |
@@ -301,7 +301,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
301 | struct saa7146_buf *buf = (struct saa7146_buf *)vb; | 301 | struct saa7146_buf *buf = (struct saa7146_buf *)vb; |
302 | 302 | ||
303 | DEB_VBI(("vb:%p\n",vb)); | 303 | DEB_VBI(("vb:%p\n",vb)); |
304 | saa7146_dma_free(dev,buf); | 304 | saa7146_dma_free(dev,q,buf); |
305 | } | 305 | } |
306 | 306 | ||
307 | static struct videobuf_queue_ops vbi_qops = { | 307 | static struct videobuf_queue_ops vbi_qops = { |