[media] s5p-jpeg: adapt to recent videobuf2 changes
authorMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 13 Jan 2012 08:12:38 +0000 (05:12 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 18 Jan 2012 00:54:45 +0000 (22:54 -0200)
queue_setup callback has been extended with struct v4l2_format *fmt
parameter in 2d86401c2c commit. This patch adds this parameter to
s5p-jpeg driver.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/s5p-jpeg/jpeg-core.c

index f841a3e9845c6f6a00028884beedd27595a0da1e..1105a8749c8b23922c979adf2abe7dee222fe14c 100644 (file)
@@ -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;