V4L/DVB: videobuf: add queue argument to videobuf_waiton()

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / dt3155v4l / dt3155v4l.c

diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/dt3155v4l/dt3155v4l.c
index fd48b38e797c7c76965f3dc21695e84b6c56db55..b996697e7eb2095cb2eafa3abe4dd8ee87745b60 100644 (file)
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c
@@ -293,7 +293,7 @@ static void
 dt3155_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
        if (vb->state == VIDEOBUF_ACTIVE)
-               videobuf_waiton(vb, 0, 0); /* FIXME: cannot be interrupted */
+               videobuf_waiton(q, vb, 0, 0); /* FIXME: cannot be interrupted */
        videobuf_dma_contig_free(q, vb);
        vb->state = VIDEOBUF_NEEDS_INIT;
 }
@@ -440,7 +440,7 @@ dt3155_open(struct file *filp)
                videobuf_queue_dma_contig_init(pd->vidq, &vbq_ops,
                                &pd->pdev->dev, &pd->lock,
                                V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
-                               sizeof(struct videobuf_buffer), pd);
+                               sizeof(struct videobuf_buffer), pd, NULL);
                /* disable all irqs, clear all irq flags */
                iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD,
                                                pd->regs + INT_CSR);
@@ -494,7 +494,7 @@ dt3155_release(struct file *filp)
                tmp = pd->curr_buf;
                spin_unlock_irqrestore(&pd->lock, flags);
                if (tmp)
-                       videobuf_waiton(tmp, 0, 1); /* block, interruptible */
+                       videobuf_waiton(pd->vidq, tmp, 0, 1); /* block, interruptible */
                dt3155_stop_acq(pd);
                videobuf_stop(pd->vidq);
                pd->acq_fp = NULL;
@@ -603,7 +603,7 @@ dt3155_ioc_streamoff(struct file *filp, void *p, enum v4l2_buf_type type)
        tmp = pd->curr_buf;
        spin_unlock_irqrestore(&pd->lock, flags);
        if (tmp)
-               videobuf_waiton(tmp, 0, 1); /* block, interruptible */
+               videobuf_waiton(pd->vidq, tmp, 0, 1); /* block, interruptible */
        return ret;
 }