diff options
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r-- | drivers/media/common/saa7146_video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 6b42713d97f4..e7079d1bd537 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -1275,7 +1275,7 @@ static int buffer_prepare(struct videobuf_queue *q, | |||
1275 | buf->vb.field != field || | 1275 | buf->vb.field != field || |
1276 | buf->vb.field != fh->video_fmt.field || | 1276 | buf->vb.field != fh->video_fmt.field || |
1277 | buf->fmt != &fh->video_fmt) { | 1277 | buf->fmt != &fh->video_fmt) { |
1278 | saa7146_dma_free(dev,buf); | 1278 | saa7146_dma_free(dev,q,buf); |
1279 | } | 1279 | } |
1280 | 1280 | ||
1281 | if (STATE_NEEDS_INIT == buf->vb.state) { | 1281 | if (STATE_NEEDS_INIT == buf->vb.state) { |
@@ -1304,7 +1304,7 @@ static int buffer_prepare(struct videobuf_queue *q, | |||
1304 | saa7146_pgtable_alloc(dev->pci, &buf->pt[0]); | 1304 | saa7146_pgtable_alloc(dev->pci, &buf->pt[0]); |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | err = videobuf_iolock(dev->pci,&buf->vb, &vv->ov_fb); | 1307 | err = videobuf_iolock(q,&buf->vb, &vv->ov_fb); |
1308 | if (err) | 1308 | if (err) |
1309 | goto oops; | 1309 | goto oops; |
1310 | err = saa7146_pgtable_build(dev,buf); | 1310 | err = saa7146_pgtable_build(dev,buf); |
@@ -1318,7 +1318,7 @@ static int buffer_prepare(struct videobuf_queue *q, | |||
1318 | 1318 | ||
1319 | oops: | 1319 | oops: |
1320 | DEB_D(("error out.\n")); | 1320 | DEB_D(("error out.\n")); |
1321 | saa7146_dma_free(dev,buf); | 1321 | saa7146_dma_free(dev,q,buf); |
1322 | 1322 | ||
1323 | return err; | 1323 | return err; |
1324 | } | 1324 | } |
@@ -1363,7 +1363,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
1363 | struct saa7146_buf *buf = (struct saa7146_buf *)vb; | 1363 | struct saa7146_buf *buf = (struct saa7146_buf *)vb; |
1364 | 1364 | ||
1365 | DEB_CAP(("vbuf:%p\n",vb)); | 1365 | DEB_CAP(("vbuf:%p\n",vb)); |
1366 | saa7146_dma_free(dev,buf); | 1366 | saa7146_dma_free(dev,q,buf); |
1367 | } | 1367 | } |
1368 | 1368 | ||
1369 | static struct videobuf_queue_ops video_qops = { | 1369 | static struct videobuf_queue_ops video_qops = { |