diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2010-12-28 11:37:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 20:31:39 -0300 |
| commit | 70f66ea2aafbd9022a5dcdfd823538e540873585 (patch) | |
| tree | d130fb9b72717ca53c95d2499a35dd5e610342d8 /drivers/media/video/s5p-fimc/fimc-capture.c | |
| parent | b241c6d6f4ceddddfd8097c702dcfdd6b38fbe18 (diff) | |
| download | kernel_samsung_smdk4412-70f66ea2aafbd9022a5dcdfd823538e540873585.zip kernel_samsung_smdk4412-70f66ea2aafbd9022a5dcdfd823538e540873585.tar.gz kernel_samsung_smdk4412-70f66ea2aafbd9022a5dcdfd823538e540873585.tar.bz2 | |
[media] s5p-fimc: Move scaler details handling to the register API file
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-capture.c')
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-capture.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 91304ee..2b03c95 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -237,7 +237,6 @@ static int start_streaming(struct vb2_queue *q) struct fimc_ctx *ctx = q->drv_priv; struct fimc_dev *fimc = ctx->fimc_dev; struct s5p_fimc_isp_info *isp_info; - struct samsung_fimc_variant *variant = ctx->fimc_dev->variant; int ret; ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1); @@ -261,10 +260,7 @@ static int start_streaming(struct vb2_queue *q) } fimc_hw_set_input_path(ctx); fimc_hw_set_prescaler(ctx); - if (variant->has_mainscaler_ext) - fimc_hw_set_mainscaler_ext(ctx); - else - fimc_hw_set_mainscaler(ctx); + fimc_hw_set_mainscaler(ctx); fimc_hw_set_target_format(ctx); fimc_hw_set_rotation(ctx); fimc_hw_set_effect(ctx); |