From patchwork Thu Mar 21 17:51:14 2013 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: 2316221 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 54515DF264 for ; Thu, 21 Mar 2013 17:50:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751582Ab3CURuk (ORCPT ); Thu, 21 Mar 2013 13:50:40 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:64024 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103Ab3CURuh (ORCPT ); Thu, 21 Mar 2013 13:50:37 -0400 Received: by mail-ee0-f43.google.com with SMTP id c50so1924358eek.16 for ; Thu, 21 Mar 2013 10:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=NbOVwupTl55ZE1GjojkRXIqeYVxSVoR1JWvcRoTk+18=; b=PLtIFLoLsI4axGMWgJri3bHoNGAmTYDH1PcvjkmYY9Qcm17ujbtPCsZCs9Q/AU8SZ8 jgReIQCgnQz65Tgxo/l60b8zfow5bwBmEizsEl3514SERhVypU82H3tEnEExJ1GwI83X QRrgM5IjtB4JReCrui7gOl5c3YwkEINMb70wUJeCV+Lm/ZZD30sBm+PqHVr+2zSap++7 dGfBCbnzDiTUZR+w83B/ci+beLWdDh9Yctn64o6ljDq0wiv712EaUYmpk3P8P26Y2/xe ndF1cemZmBJv3kOnZThFfS6nyeSvgDV3ISjRmqiBgqRqPtY1zvfGd2Hbv6pfN9+USzIr vEBg== X-Received: by 10.14.216.2 with SMTP id f2mr85036553eep.44.1363888235689; Thu, 21 Mar 2013 10:50:35 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-109-90-213-82.unitymediagroup.de. [109.90.213.82]) by mx.google.com with ESMTPS id k7sm9808377een.8.2013.03.21.10.50.34 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 10:50:35 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 2/8] bttv: audio_mux(): do not change the value of the v4l2 mute control Date: Thu, 21 Mar 2013 18:51:14 +0100 Message-Id: <1363888280-28724-3-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363888280-28724-1-git-send-email-fschaefer.oss@googlemail.com> References: <1363888280-28724-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 There are cases where we want to call audio_mux() without changing the value of the v4l2 mute control, for example - mute mute on last close - mute on device probing Signed-off-by: Frank Schäfer Acked-by: Hans Verkuil --- drivers/media/pci/bt8xx/bttv-driver.c | 8 ++++---- 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index a584d82..a082ab4 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -999,7 +999,6 @@ audio_mux(struct bttv *btv, int input, int mute) bttv_tvcards[btv->c.type].gpiomask); signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC; - btv->mute = mute; btv->audio = input; /* automute */ @@ -1031,7 +1030,7 @@ audio_mux(struct bttv *btv, int input, int mute) ctrl = v4l2_ctrl_find(btv->sd_msp34xx->ctrl_handler, V4L2_CID_AUDIO_MUTE); if (ctrl) - v4l2_ctrl_s_ctrl(ctrl, btv->mute); + v4l2_ctrl_s_ctrl(ctrl, mute); /* Note: the inputs tuner/radio/extern/intern are translated to msp routings. This assumes common behavior for all msp3400 @@ -1080,7 +1079,7 @@ audio_mux(struct bttv *btv, int input, int mute) ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE); if (ctrl) - v4l2_ctrl_s_ctrl(ctrl, btv->mute); + v4l2_ctrl_s_ctrl(ctrl, mute); v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing, input, 0, 0); } @@ -1088,7 +1087,7 @@ audio_mux(struct bttv *btv, int input, int mute) ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE); if (ctrl) - v4l2_ctrl_s_ctrl(ctrl, btv->mute); + v4l2_ctrl_s_ctrl(ctrl, mute); } return 0; } @@ -1300,6 +1299,7 @@ static int bttv_s_ctrl(struct v4l2_ctrl *c) break; case V4L2_CID_AUDIO_MUTE: audio_mute(btv, c->val); + btv->mute = c->val; break; case V4L2_CID_AUDIO_VOLUME: btv->volume_gpio(btv, c->val);