From ac6bc6140bbd0dd53387f48b5a7170be8da9e9ca Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath Date: Mon, 9 Nov 2009 09:07:36 -0300 Subject: [PATCH] --- yaml --- r: 174160 b: refs/heads/master c: 204e6ea981ac46974508ddf403dbb72dc804dcb3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/davinci/vpfe_capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53ea806ea4e8..008aab836643 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47a50307982b4a3de2d7270c28527c3a360269bf +refs/heads/master: 204e6ea981ac46974508ddf403dbb72dc804dcb3 diff --git a/trunk/drivers/media/video/davinci/vpfe_capture.c b/trunk/drivers/media/video/davinci/vpfe_capture.c index 6b31e59f47f3..c704a2637683 100644 --- a/trunk/drivers/media/video/davinci/vpfe_capture.c +++ b/trunk/drivers/media/video/davinci/vpfe_capture.c @@ -1338,7 +1338,7 @@ static int vpfe_reqbufs(struct file *file, void *priv, vpfe_dev->memory = req_buf->memory; videobuf_queue_dma_contig_init(&vpfe_dev->buffer_queue, &vpfe_videobuf_qops, - NULL, + vpfe_dev->pdev, &vpfe_dev->irqlock, req_buf->type, vpfe_dev->fmt.fmt.pix.field,