]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: v4l2-pci-skeleton.c: fix outdated irq code
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Mon, 21 Jan 2019 11:14:32 +0000 (09:14 -0200)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 25 Jan 2019 20:47:06 +0000 (18:47 -0200)
Fix the outdated irq example code. It is under an #ifdef TODO
so it is never actually compiled and this code was never compiled.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
samples/v4l/v4l2-pci-skeleton.c

index 27ec30952cfab96368e61fad8b9ab20d5cd12fae..758ced8c3d064640e7690c244e373ef381b12b28 100644 (file)
@@ -139,16 +139,16 @@ static irqreturn_t skeleton_irq(int irq, void *dev_id)
                spin_lock(&skel->qlock);
                list_del(&new_buf->list);
                spin_unlock(&skel->qlock);
-               v4l2_get_timestamp(&new_buf->vb.v4l2_buf.timestamp);
-               new_buf->vb.v4l2_buf.sequence = skel->sequence++;
-               new_buf->vb.v4l2_buf.field = skel->field;
+               new_buf->vb.vb2_buf.timestamp = ktime_get_ns();
+               new_buf->vb.sequence = skel->sequence++;
+               new_buf->vb.field = skel->field;
                if (skel->format.field == V4L2_FIELD_ALTERNATE) {
                        if (skel->field == V4L2_FIELD_BOTTOM)
                                skel->field = V4L2_FIELD_TOP;
                        else if (skel->field == V4L2_FIELD_TOP)
                                skel->field = V4L2_FIELD_BOTTOM;
                }
-               vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_DONE);
+               vb2_buffer_done(&new_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
 #endif
        return IRQ_HANDLED;