From 41c8a4d57cbbd428d55f10260debb76c7c898c28 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 30 Nov 2010 06:23:10 -0300 Subject: [PATCH] --- yaml --- r: 223555 b: refs/heads/master c: 09b693f0bdf360b6a8e099f26c771c9fca4c3447 h: refs/heads/master i: 223553: d099bedf943263f199db5ec44587b56a441583a4 223551: 6d3bd6133372695c8f5c3cbaf4d75fe8c81d1e8f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df3c2e9cb09e..657deda4b0bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd05e79f72d318d57e625825a5212e3fb90ea4a3 +refs/heads/master: 09b693f0bdf360b6a8e099f26c771c9fca4c3447 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c index 1b93207c89e8..017cf6c50954 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c @@ -785,7 +785,7 @@ int fimc_register_capture_device(struct fimc_dev *fimc) videobuf_queue_dma_contig_init(&vid_cap->vbq, &fimc_qops, vid_cap->v4l2_dev.dev, &fimc->irqlock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, - sizeof(struct fimc_vid_buffer), (void *)ctx); + sizeof(struct fimc_vid_buffer), (void *)ctx, NULL); ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1); if (ret) {