From ac08845fe58ca6a932aef7873052a92b72b01738 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 13 Jan 2012 05:12:38 -0300 Subject: [PATCH] --- yaml --- r: 286426 b: refs/heads/master c: 719c174ee9005e44b61bc8ab295f05851a989e21 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-jpeg/jpeg-core.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d0486a65ff1e..f1cc735b0fd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f6cce69e2667fdf0ee978641ee4325ea05ce3f8 +refs/heads/master: 719c174ee9005e44b61bc8ab295f05851a989e21 diff --git a/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c b/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c index f841a3e9845c..1105a8749c8b 100644 --- a/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c +++ b/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c @@ -989,9 +989,10 @@ static struct v4l2_m2m_ops s5p_jpeg_m2m_ops = { * ============================================================================ */ -static int s5p_jpeg_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, - unsigned int *nplanes, unsigned int sizes[], - void *alloc_ctxs[]) +static int s5p_jpeg_queue_setup(struct vb2_queue *vq, + const struct v4l2_format *fmt, + unsigned int *nbuffers, unsigned int *nplanes, + unsigned int sizes[], void *alloc_ctxs[]) { struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vq); struct s5p_jpeg_q_data *q_data = NULL;