diff --git a/[refs] b/[refs] index 74baa9c35248..856a7e6232cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e4748d867781732c29c00fe8fe4b179d914a977 +refs/heads/master: 566afaace58e3a800d2a903424960ad97d203c68 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.c b/trunk/drivers/media/video/s5p-fimc/fimc-core.c index a51bf309f4dc..afadb5e20b88 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-core.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.c @@ -1898,7 +1898,7 @@ static struct samsung_fimc_variant fimc0_variant_exynos4 = { .has_mainscaler_ext = 1, .min_inp_pixsize = 16, .min_out_pixsize = 16, - .hor_offs_align = 1, + .hor_offs_align = 2, .out_buf_count = 32, .pix_limit = &s5p_pix_limit[1], }; @@ -1910,7 +1910,7 @@ static struct samsung_fimc_variant fimc3_variant_exynos4 = { .has_mainscaler_ext = 1, .min_inp_pixsize = 16, .min_out_pixsize = 16, - .hor_offs_align = 1, + .hor_offs_align = 2, .out_buf_count = 32, .pix_limit = &s5p_pix_limit[3], };