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: 6790681 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 13A6F9F6CE for ; Wed, 15 Jul 2015 00:34:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47246206A2 for ; Wed, 15 Jul 2015 00:34:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0631B206BD for ; Wed, 15 Jul 2015 00:34:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752377AbbGOAe2 (ORCPT ); Tue, 14 Jul 2015 20:34:28 -0400 Received: from resqmta-po-04v.sys.comcast.net ([96.114.154.163]:36620 "EHLO resqmta-po-04v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbbGOAe1 (ORCPT ); Tue, 14 Jul 2015 20:34:27 -0400 Received: from resomta-po-08v.sys.comcast.net ([96.114.154.232]) by resqmta-po-04v.sys.comcast.net with comcast id sQaR1q009516pyw01QaT1Y; 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 Cc: Shuah Khan , linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 4/7] media: change dvb-frontend to honor MC tuner enable error 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=tFRf6xJPOMUiSM/aDgzQ6Qi4+3x/dbDqCygY5Y0Nikrfcs/dpmyofk9lHH2WVnJ9a 4e98wVWuy5u56/vrYegoBfNi6nGVPb9K7Ejhm7K0z0CpdKXFdtJEjpxCAU9LQNpHRT yatROzHe0RrR5SXPCY/djwZXDPPrtVBP6ua5Pk7PcDIvoQ+r5a07jHBXL+V3bDrH7B SabYpgJNrT7Jahajxrlf1u/qhL5S6hg5Volqsfsxo7HldV5pwMHOH5HuC+d6PnRNnF YTOlq3JYts2qiBgTBqSuxDOszAIBPa0oYXIufFFab9mu2waZtFmPEmN73AyF4+ciVC s/ESOcwtPTe2Q== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.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);