From patchwork Wed Jul 15 00:34:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 6794181 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 65E5EC05AC for ; Wed, 15 Jul 2015 07:44:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DB90205C4 for ; Wed, 15 Jul 2015 07:44:42 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5CF3A20585 for ; Wed, 15 Jul 2015 07:44:41 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3B7DF2664FF; Wed, 15 Jul 2015 09:44:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 99763265ABB; Wed, 15 Jul 2015 09:35:39 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 11152265736; Wed, 15 Jul 2015 02:34:42 +0200 (CEST) Received: from resqmta-po-08v.sys.comcast.net (resqmta-po-08v.sys.comcast.net [96.114.154.167]) by alsa0.perex.cz (Postfix) with ESMTP id 1611B26570A for ; Wed, 15 Jul 2015 02:34:27 +0200 (CEST) Received: from resomta-po-08v.sys.comcast.net ([96.114.154.232]) by resqmta-po-08v.sys.comcast.net with comcast id sQZ31q002516pyw01QaTkU; Wed, 15 Jul 2015 00:34:27 +0000 Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-08v.sys.comcast.net with comcast id sQaS1q0011LXgTt01QaSNe; Wed, 15 Jul 2015 00:34:27 +0000 Received: from lorien.internal (lorien-wl.internal [192.168.1.40]) by mail.gonehiking.org (Postfix) with ESMTP id 8B471120445; Tue, 14 Jul 2015 18:34:25 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, tiwai@suse.de, perex@perex.cz, crope@iki.fi, sakari.ailus@linux.intel.com, arnd@arndb.de, stefanr@s5r6.in-berlin.de, ruchandani.tina@gmail.com, chehabrafael@gmail.com, dan.carpenter@oracle.com, prabhakar.csengg@gmail.com, chris.j.arges@canonical.com, agoode@google.com, pierre-louis.bossart@linux.intel.com, gtmkramer@xs4all.nl, clemens@ladisch.de, daniel@zonque.org, vladcatoi@gmail.com, misterpib@gmail.com, damien@zamaudio.com, pmatilai@laiskiainen.org, takamichiho@gmail.com, normalperson@yhbt.net, bugzilla.frnkcg@spamgourmet.com, joe@oampo.co.uk, calcprogrammer1@gmail.com, jussi@sonarnerd.net Date: Tue, 14 Jul 2015 18:34:03 -0600 Message-Id: <3fd487dbc197e7bcba390dc0d820b4264f426ff0.1436917513.git.shuahkh@osg.samsung.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1436920467; bh=sKVf913mrNJkb2Ni8CSv7nl4d0FrLbrWu7kgblH5GP4=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=S0BySeTtW5UypYVh0Inzm/ilYBtTyshs+3psVXJdF/1q+6C2bihMMAB/6mbfxtFDJ ZQ8dygSvOYOD/Q8Srgj1M/2cJw7w0+1szhSaFCcVmn6n3YvX07FtVF0IgetaH7n3xH KOIvi8gGfV81dLJFGvNzqvMGHlRAH8xMdG2FpDGml83vLUV+kRP5LYoaOj3PaSqBUQ ajmmyFUAytlekruNUA72phlP21OT8RLqm1fcXh5p/7hwI/dNcKIzMxmO1Xfy8ep2ds 7psUrcBY5AVjfUY2N1dTVpGzpAD0YpxHFhAOShsEKqBLajPb5pcBqr6TO14tR4Lked ia+b4IQe415JA== X-Mailman-Approved-At: Wed, 15 Jul 2015 09:35:32 +0200 Cc: alsa-devel@alsa-project.org, Shuah Khan , linux-media@vger.kernel.org Subject: [alsa-devel] [PATCH 4/7] media: change dvb-frontend to honor MC tuner enable error X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Change dvb_frontend_thread() to honor MC tuner enable error and return as opposed to ignoring the error and continuing to use it. Signed-off-by: Shuah Khan --- drivers/media/dvb-core/dvb_frontend.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 842b9c8..5a86211 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -713,9 +713,8 @@ static int dvb_frontend_thread(void *data) #ifdef CONFIG_MEDIA_CONTROLLER_DVB ret = dvb_enable_media_tuner(fe); if (ret) { - /* FIXME: return an error if it fails */ - dev_info(fe->dvb->device, - "proceeding with FE task\n"); + dev_err(fe->dvb->device, "Tuner is busy. Error %d\n", ret); + return ret; } else if (fepriv->pipe_start_entity) { ret = media_entity_pipeline_start(fepriv->pipe_start_entity, &fepriv->pipe);