From 9e217ac3f8bcb966c3d4037926dfa5e4c71a0a62 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Mon, 26 Nov 2012 11:08:26 -0300 Subject: [PATCH] --- yaml --- r: 357034 b: refs/heads/master c: 1bc05e77db1b0c2f5ec3917a9b21d64c01342b5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/fimc-reg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7aa20df7fe3d..0c88134ccd13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe4abb550f68ace5bbc23030c968c138c6a69759 +refs/heads/master: 1bc05e77db1b0c2f5ec3917a9b21d64c01342b5f diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-reg.c b/trunk/drivers/media/platform/s5p-fimc/fimc-reg.c index 2c9d0c06c9e8..9c3c461a5099 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-reg.c +++ b/trunk/drivers/media/platform/s5p-fimc/fimc-reg.c @@ -44,9 +44,9 @@ static u32 fimc_hw_get_in_flip(struct fimc_ctx *ctx) u32 flip = FIMC_REG_MSCTRL_FLIP_NORMAL; if (ctx->hflip) - flip = FIMC_REG_MSCTRL_FLIP_X_MIRROR; - if (ctx->vflip) flip = FIMC_REG_MSCTRL_FLIP_Y_MIRROR; + if (ctx->vflip) + flip = FIMC_REG_MSCTRL_FLIP_X_MIRROR; if (ctx->rotation <= 90) return flip; @@ -59,9 +59,9 @@ static u32 fimc_hw_get_target_flip(struct fimc_ctx *ctx) u32 flip = FIMC_REG_CITRGFMT_FLIP_NORMAL; if (ctx->hflip) - flip |= FIMC_REG_CITRGFMT_FLIP_X_MIRROR; - if (ctx->vflip) flip |= FIMC_REG_CITRGFMT_FLIP_Y_MIRROR; + if (ctx->vflip) + flip |= FIMC_REG_CITRGFMT_FLIP_X_MIRROR; if (ctx->rotation <= 90) return flip;