From patchwork Thu Mar 21 17:51:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17551 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UIjda-0007JM-DW; Thu, 21 Mar 2013 18:50:50 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1UIjdY-0004Dm-Iz; Thu, 21 Mar 2013 18:50:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934Ab3CURup (ORCPT + 1 other); Thu, 21 Mar 2013 13:50:45 -0400 Received: from mail-ee0-f51.google.com ([74.125.83.51]:38787 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751912Ab3CURun (ORCPT ); Thu, 21 Mar 2013 13:50:43 -0400 Received: by mail-ee0-f51.google.com with SMTP id d17so1850557eek.24 for ; Thu, 21 Mar 2013 10:50:42 -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=dGTZ0GrU88QrIm4gY9QTwEoDNHaYtNfOXpBDLVf3o4A=; b=gcyd7URr9DVleq/cUOPCGA5h776kCpLM37r6JZmesC4+uV2MsCB2FMiLEFZAJD0ZXw U8x0++rlOhPsTbV/4IEPJ/tnkxzoyIobp+JSU6OY1WY34fln6d0WSSlkcfWi1C+HWBxV crkCbV92xkoLq0YqpUk+G5tyXDv0h8K3idHIiMLd8veE0jMaXEpCggsMQT3taI2sV9d5 ao+XXAfhYBjCG9cC6rs+oMOOEpYXhr7TdrAy5W9+VZm3Ts/ombJ1+72LT3erpW2cVuPt kw9lF4p4TtJuSbCuB5g9r5EJUoY7soD24F510pCiVP24UOyJeD/bfMM4Ak4n/FLdeSR7 nR+Q== X-Received: by 10.14.184.68 with SMTP id r44mr84222528eem.40.1363888241717; Thu, 21 Mar 2013 10:50:41 -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.41 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 10:50:41 -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 8/8] bttv: apply mute settings on open Date: Thu, 21 Mar 2013 18:51:20 +0100 Message-Id: <1363888280-28724-9-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 X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.21.174524 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Previously, this has been done implicitly for video device nodes by calling set_input() (which calls audio_input() and also modified the mute setting). Since input and mute setting are now untangled (as much as possible), we need to apply the mute setting with an explicit call to audio_mute(). Also apply the mute setting when the radio device node gets opened. Signed-off-by: Frank Schäfer Acked-by: Hans Verkuil --- drivers/media/pci/bt8xx/bttv-driver.c | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 55eab61..2fb2168 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -3065,7 +3065,7 @@ static int bttv_open(struct file *file) fh, &btv->lock); set_tvnorm(btv,btv->tvnorm); set_input(btv, btv->input, btv->tvnorm); - + audio_mute(btv, btv->mute); /* The V4L2 spec requires one global set of cropping parameters which only change on request. These are stored in btv->crop[1]. @@ -3230,6 +3230,7 @@ static int radio_open(struct file *file) v4l2_fh_init(&fh->fh, vdev); btv->radio_user++; + audio_mute(btv, btv->mute); v4l2_fh_add(&fh->fh);