]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] s5p-mfc: v4l2 controls setup routine moved to initialization code
authorAndrzej Hajda <a.hajda@samsung.com>
Tue, 28 May 2013 06:26:15 +0000 (03:26 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 3 Jun 2013 18:56:37 +0000 (15:56 -0300)
Callback .start_streaming is called once for every queue,
so v4l2_ctrl_handler_setup was called twice during stream start.
Moving v4l2_ctrl_handler_setup to context initialization
reduces numbers of calls and seems to be more consistent with API.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

index 5e019aa6113be1a7a8cd761a19dc4a35dca9de52..5d97a984fc06e286606ac8f6bdbe8c3b15cc22f2 100644 (file)
@@ -1789,7 +1789,6 @@ static int s5p_mfc_start_streaming(struct vb2_queue *q, unsigned int count)
                }
        }
 
-       v4l2_ctrl_handler_setup(&ctx->ctrl_handler);
        /* If context is ready then dev = work->data;schedule it to run */
        if (s5p_mfc_ctx_ready(ctx))
                set_work_bit_irqsave(ctx);
@@ -1950,6 +1949,7 @@ int s5p_mfc_enc_ctrls_setup(struct s5p_mfc_ctx *ctx)
                if (controls[i].is_volatile && ctx->ctrls[i])
                        ctx->ctrls[i]->flags |= V4L2_CTRL_FLAG_VOLATILE;
        }
+       v4l2_ctrl_handler_setup(&ctx->ctrl_handler);
        return 0;
 }