diff options
Diffstat (limited to 'drivers/media/video/omap24xxcam.c')
-rw-r--r-- | drivers/media/video/omap24xxcam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 926a5aa6f7f8..378b094aff16 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
@@ -420,7 +420,7 @@ static void omap24xxcam_vbq_release(struct videobuf_queue *vbq, | |||
420 | struct videobuf_dmabuf *dma = videobuf_to_dma(vb); | 420 | struct videobuf_dmabuf *dma = videobuf_to_dma(vb); |
421 | 421 | ||
422 | /* wait for buffer, especially to get out of the sgdma queue */ | 422 | /* wait for buffer, especially to get out of the sgdma queue */ |
423 | videobuf_waiton(vb, 0, 0); | 423 | videobuf_waiton(vbq, vb, 0, 0); |
424 | if (vb->memory == V4L2_MEMORY_MMAP) { | 424 | if (vb->memory == V4L2_MEMORY_MMAP) { |
425 | dma_unmap_sg(vbq->dev, dma->sglist, dma->sglen, | 425 | dma_unmap_sg(vbq->dev, dma->sglist, dma->sglen, |
426 | dma->direction); | 426 | dma->direction); |
@@ -1491,7 +1491,7 @@ static int omap24xxcam_open(struct file *file) | |||
1491 | videobuf_queue_sg_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL, | 1491 | videobuf_queue_sg_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL, |
1492 | &fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, | 1492 | &fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, |
1493 | V4L2_FIELD_NONE, | 1493 | V4L2_FIELD_NONE, |
1494 | sizeof(struct videobuf_buffer), fh); | 1494 | sizeof(struct videobuf_buffer), fh, NULL); |
1495 | 1495 | ||
1496 | return 0; | 1496 | return 0; |
1497 | 1497 | ||