From patchwork Sun Mar 10 21:53:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17254 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UEoBP-0000id-8B; Sun, 10 Mar 2013 22:53:31 +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 1UEoBO-00011T-I3; Sun, 10 Mar 2013 22:53:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753328Ab3CJVx2 (ORCPT + 1 other); Sun, 10 Mar 2013 17:53:28 -0400 Received: from mail-ea0-f169.google.com ([209.85.215.169]:59409 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753313Ab3CJVxU (ORCPT ); Sun, 10 Mar 2013 17:53:20 -0400 Received: by mail-ea0-f169.google.com with SMTP id z7so878368eaf.14 for ; Sun, 10 Mar 2013 14:53:19 -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=eqWmYP3jlDB/2XzK79DwJHYEJTLE/pG1hbzwGsaizTA=; b=iU3JpUFMx2vwABy2eQ7N/alWtGVON73rzEsgvO8s1UiYZEgxnOAYhAl/Oj7RDFy6VY sEQ0WKrSxLKPSoWHLSSE8JAM6lIbAvcBsZkqxWnIQ6XQAJEtTQFicf5n0IJbm8K7K/bz pCtelIIcxnt6iFamceCTuFLr6LhbOR0t2XKYxg42MO9UfJ6lacBnjaBGXIJvTbLKMW2S dp2fyuVzkziG6kdYmXNcAoI8ijqr3unISJT3VV7oikALxEvIeO2BNlak8/8kUISA2hxQ +U8hOtoUF2AKSVPh+pigqS5otPYid7eGjhcCFHlQbf1unjDgO5uUb+708s2xIYx5N7I8 zt0g== X-Received: by 10.14.225.72 with SMTP id y48mr29715241eep.45.1362952399355; Sun, 10 Mar 2013 14:53:19 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-178-200-115-25.unitymediagroup.de. [178.200.115.25]) by mx.google.com with ESMTPS id q5sm20079785eep.11.2013.03.10.14.53.18 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Mar 2013 14:53:18 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [RFC PATCH v2 4/6] bttv: do not unmute the device before the first open Date: Sun, 10 Mar 2013 22:53:52 +0100 Message-Id: <1362952434-2974-5-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362952434-2974-1-git-send-email-fschaefer.oss@googlemail.com> References: <1362952434-2974-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.10.214223 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_1400_1499 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_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' Signed-off-by: Frank Schäfer --- drivers/media/pci/bt8xx/bttv-driver.c | 8 +++++--- 1 Datei geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 945ecd2..6432bfe 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -3062,8 +3062,7 @@ static int bttv_open(struct file *file) sizeof(struct bttv_buffer), fh, &btv->lock); set_tvnorm(btv,btv->tvnorm); - set_input(btv, btv->input, btv->tvnorm); - + set_input(btv, btv->input, btv->tvnorm); /* also (un)mutes audio */ /* The V4L2 spec requires one global set of cropping parameters which only change on request. These are stored in btv->crop[1]. @@ -4209,11 +4208,14 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) btv->std = V4L2_STD_PAL; init_irqreg(btv); v4l2_ctrl_handler_setup(hdl); - if (hdl->error) { result = hdl->error; goto fail2; } + + /* mute device */ + audio_mute(btv, 1); + /* register video4linux + input */ if (!bttv_tvcards[btv->c.type].no_video) { v4l2_ctrl_add_handler(&btv->radio_ctrl_handler, hdl,