From patchwork Sun Mar 10 21:53:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17252 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UEoBL-0000iC-Ix; Sun, 10 Mar 2013 22:53:27 +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-4) with esmtp id 1UEoBK-0005Xs-Co; Sun, 10 Mar 2013 22:53:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753327Ab3CJVxX (ORCPT + 1 other); Sun, 10 Mar 2013 17:53:23 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:40900 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995Ab3CJVxW (ORCPT ); Sun, 10 Mar 2013 17:53:22 -0400 Received: by mail-ee0-f49.google.com with SMTP id d41so1840605eek.8 for ; Sun, 10 Mar 2013 14:53:21 -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=L1lY1HMIaA8QrQOBHRl4ycrNS3NFyRsEIptap5p695U=; b=NA0K9TJbxK5aW3r/U5dW/lhoX2PBzX7w5ACGNNrtv1lqwjj+FGDxBMemNbtLal+3IH T2ARYDWX12Mki61V7TbsSaR+6TFADDB4IGsExSOa/jyBTPFQoKNuZ+EBKkbVvYTS4R2F aivVGU7Fd3jiG0patKRh/pOD1sqZf5Nd2+2LxM2CcQTaq9hcFmj+lu4zEjJALSpeQx7L oXM78f6aBtfMpapDBtYGzbja8HRvnP/3lZwj5JXAWWh0E8BuChKD5SSLSxNMhYfCL0Kx oYjch0UdkVf5T1QnfIh5R3Yy0Bk/vv9K+SFolU4MntPGoqqrNQZTvYfTSsmkehhD9aca ReTA== X-Received: by 10.15.101.204 with SMTP id bp52mr29777369eeb.31.1362952400841; Sun, 10 Mar 2013 14:53:20 -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.19 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Mar 2013 14:53:20 -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 5/6] bttv: avoid mute on last close when the radio device node is still open Date: Sun, 10 Mar 2013 22:53:53 +0100 Message-Id: <1362952434-2974-6-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.214814 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' In contrast to video devices, radio devices should not be muted on the last close of the device node. In cases where a device provides a video and a radio device node, tuner ownership has to be taken into account. The current code doesn't handle tuner ownership yet, so never mute the device if the radio device node is still open. Also add a comment about this issue. Signed-off-by: Frank Schäfer --- drivers/media/pci/bt8xx/bttv-driver.c | 6 ++++-- 1 Datei geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 6432bfe..7459ad6 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -3114,7 +3114,6 @@ static int bttv_release(struct file *file) } /* free stuff */ - videobuf_mmap_free(&fh->cap); videobuf_mmap_free(&fh->vbi); file->private_data = NULL; @@ -3122,8 +3121,11 @@ static int bttv_release(struct file *file) btv->users--; bttv_field_count(btv); - if (!btv->users) + if (!btv->users && !btv->radio_user) audio_mute(btv, 1); + /* FIXME: should also depend on tuner ownership ! */ + /* NOTE as long as we don't handle the tuner ownership properly, + * only mute the device if the radio device node isn't open. */ v4l2_fh_del(&fh->fh); v4l2_fh_exit(&fh->fh);