From patchwork Sun Sep 9 18:02:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Frank_Sch=C3=A4fer?= X-Patchwork-Id: 1427891 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6B7C740AB9 for ; Sun, 9 Sep 2012 18:02:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754409Ab2IISBx (ORCPT ); Sun, 9 Sep 2012 14:01:53 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:50521 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188Ab2IISBo (ORCPT ); Sun, 9 Sep 2012 14:01:44 -0400 Received: by eaac11 with SMTP id c11so540081eaa.19 for ; Sun, 09 Sep 2012 11:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=bTZwjbBkuJavIBO30PEKJRbr94vhXBqduHrtPUxbQ2U=; b=fmBl85jpF9eTkGmQPnMPmb7YhKofmoM6QyiRsR2h1hmILlFR4Zdf93j1kt2LpCKgn4 Khg/iBJTYEgRZVSOrwVJBMXN9JxJuQztXS1ex7S334sFiud0y6JnUJJZByz5Fv7fThyM yxiWhDlpRFAMcDlhblb7LM6xfrSSEe2Y9BZr693+gCNML2aVSlUjdv13I9AOdynyI1xh Pgo3a/FfcvfccYXjcODbCkvVQGj2czUL7cUyeFLFNMwrFKJ+gqBz3DSctqhHoecBCQkw WhK7d3HQJ5FxdoQh2z75E8lNYHwrDC4DCImsMwyy1iaUnfmYdO8FQP4O7X+OxURpuOVL h2NQ== Received: by 10.205.122.134 with SMTP id gg6mr3271457bkc.102.1347213703035; Sun, 09 Sep 2012 11:01:43 -0700 (PDT) Received: from localhost.localdomain (ip-176-199-46-78.unitymediagroup.de. [176.199.46.78]) by mx.google.com with ESMTPS id n5sm5475483bkv.14.2012.09.09.11.01.41 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 11:01:42 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: hdegoede@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 2/6] gspca_pac7302: make red balance and blue balance controls work again Date: Sun, 9 Sep 2012 20:02:20 +0200 Message-Id: <1347213744-8509-2-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1347213744-8509-1-git-send-email-fschaefer.oss@googlemail.com> References: <1347213744-8509-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Fix a regression from kernel 3.4 which has been introduced with the conversion of the gspca driver to the v4l2 control framework. Signed-off-by: Frank Schäfer Cc: stable@kernel.org --- drivers/media/usb/gspca/pac7302.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c index e906f56..eb3c90e4 100644 --- a/drivers/media/usb/gspca/pac7302.c +++ b/drivers/media/usb/gspca/pac7302.c @@ -616,7 +616,7 @@ static int sd_init_controls(struct gspca_dev *gspca_dev) sd->red_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, V4L2_CID_RED_BALANCE, 0, 3, 1, 1); sd->blue_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, - V4L2_CID_RED_BALANCE, 0, 3, 1, 1); + V4L2_CID_BLUE_BALANCE, 0, 3, 1, 1); gspca_dev->autogain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, V4L2_CID_AUTOGAIN, 0, 1, 1, 1);