From patchwork Tue Jan 10 09:46:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 6139 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 15B8F23F82 for ; Tue, 10 Jan 2012 09:51:05 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id F09D7A185C5 for ; Tue, 10 Jan 2012 09:51:04 +0000 (UTC) Received: by bkbzu5 with SMTP id zu5so391783bkb.11 for ; Tue, 10 Jan 2012 01:51:04 -0800 (PST) Received: by 10.204.149.130 with SMTP id t2mr3858107bkv.9.1326189064621; Tue, 10 Jan 2012 01:51:04 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs77722bkc; Tue, 10 Jan 2012 01:51:04 -0800 (PST) Received: by 10.50.40.133 with SMTP id x5mr1293636igk.29.1326189062384; Tue, 10 Jan 2012 01:51:02 -0800 (PST) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id b2si46717402iga.73.2012.01.10.01.51.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jan 2012 01:51:02 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by iabz7 with SMTP id z7so838251iab.37 for ; Tue, 10 Jan 2012 01:51:01 -0800 (PST) Received: by 10.50.157.131 with SMTP id wm3mr1761353igb.13.1326189061582; Tue, 10 Jan 2012 01:51:01 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id lu10sm128044180igc.0.2012.01.10.01.50.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jan 2012 01:51:01 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: mchehab@infradead.org, s.nawrocki@samsung.com, kyungmin.park@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH] [media] s5p-fimc: Fix incorrect control ID assignment Date: Tue, 10 Jan 2012 15:16:57 +0530 Message-Id: <1326188817-12549-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 This patch fixes the mismatch between control IDs (CID) and controls for hflip, vflip and rotate. Signed-off-by: Sachin Kamat --- drivers/media/video/s5p-fimc/fimc-core.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c index 07c6254..170f791 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.c +++ b/drivers/media/video/s5p-fimc/fimc-core.c @@ -811,11 +811,11 @@ int fimc_ctrls_create(struct fimc_ctx *ctx) v4l2_ctrl_handler_init(&ctx->ctrl_handler, 3); ctx->ctrl_rotate = v4l2_ctrl_new_std(&ctx->ctrl_handler, &fimc_ctrl_ops, - V4L2_CID_HFLIP, 0, 1, 1, 0); + V4L2_CID_ROTATE, 0, 270, 90, 0); ctx->ctrl_hflip = v4l2_ctrl_new_std(&ctx->ctrl_handler, &fimc_ctrl_ops, - V4L2_CID_VFLIP, 0, 1, 1, 0); + V4L2_CID_HFLIP, 0, 1, 1, 0); ctx->ctrl_vflip = v4l2_ctrl_new_std(&ctx->ctrl_handler, &fimc_ctrl_ops, - V4L2_CID_ROTATE, 0, 270, 90, 0); + V4L2_CID_VFLIP, 0, 1, 1, 0); ctx->ctrls_rdy = ctx->ctrl_handler.error == 0; return ctx->ctrl_handler.error;